NORMAH8

Author: bilam

jsrc/j.h

@@ -847,11 +847,6 @@ struct jtimespec jmtfclk(void); //'fast clock'; maybe less inaccurate; intended
 #define EMSGINVINFL 0x40000  // set to append 'invalid inflection' to msg
 #define EMSGNOMSGLINE 0x80000  // set to append 'invalid inflection' to msg
 
-// debugging AD header length
-#ifndef NORMAH8
-#define NORMAH8 0
-#endif
-
 #ifndef PYXES
 #if SY_64
 #define PYXES 1
@@ -860,6 +855,15 @@ struct jtimespec jmtfclk(void); //'fast clock'; maybe less inaccurate; intended
 #endif
 #endif
 
+// debugging AD header length
+#ifndef NORMAH8
+#define NORMAH8 0
+#endif
+#if !SY_64 && PYXES
+#undef NORMAH8
+#define NORMAH8 1
+#endif
+
 // if we are not multithreading, report the master thread only
 #if !PYXES
 #undef MAXTHREADS
@@ -1418,6 +1422,7 @@ if(likely(!((I)jtfg&JTWILLBEOPENED)))z=EPILOGNORET(z); RETF(z); \
 #define ACVCACHEWRITEUNLOCK ++JT(jt,fnasgnct);  // increment cache count
 #define ACVCACHECLEAR ++JT(jt,fnasgnct);  // increment cache count - used when we aren't freeing the only reference to the acv
 #endif
+#if C_AVX2 || EMU_AVX2
 // Support for int-to-float, in parallel.  Input is u, 64-bit int with a type of float; result is 64-bit floats.  Define DECLS first.
 // we use initecho() to initialize zero and one because the compiler moves the initialization to inside the loop
 #define CVTEPI64DECLS  __m256i magic_i_lo = _mm256_castpd_si256(_mm256_broadcast_sd(&two_52)); /* 2^52 */ \
@@ -1438,6 +1443,7 @@ if(likely(!((I)jtfg&JTWILLBEOPENED)))z=EPILOGNORET(z); RETF(z); \
                         __m256d u_hi_dbl = _mm256_sub_pd(_mm256_castsi256_pd(u_hi), _mm256_castsi256_pd(magic_i_all)); /* Compute in double precision:  */ \
                          z = _mm256_add_pd(u_hi_dbl, _mm256_castsi256_pd(u_lo));}  /* (u_hi - magic_d_all) + u_lo  Do not assume associativity of floating point addition !! */
 #endif
+#endif
 // # turns through a Duff loop of m1+1 elements, with 1<<lgduff instances in the loop.  We assume we are handling [1,NPAR] elements at the end
 #define DUFFLPCTV(m1,lgduff,lgeleperiter) ((((m1)+((((I)1<<(lgduff))-1)<<(lgeleperiter)))>>((lgeleperiter)+(lgduff))))
 #define DUFFLPCT(m1,lgduff) DUFFLPCTV(m1,lgduff,LGNPAR)

jsrc/xdic.c

@@ -143,18 +143,14 @@ typedef struct ADic {
   // end of second cacheline.  Following changed only by put/del
   UI cardinality;  // number of kvs in the hashtable
   UI emptyn;  // index to next empty kv/treeslot.  EOC loops back on itself.  Resize when empty
+#if NORMAH8
+  I filler3[SY_64?5:0];  // pad to cacheline (24 words on each system).
+#else
   I filler3[SY_64?6:1];  // pad to cacheline (24 words on each system).
+#endif
  } bloc;
 } DIC;
-#if 7==NORMAH
 _Static_assert(sizeof(DIC)==32*SZI,"DIC not 32 Is");
-#else
-#if SY_64
-_Static_assert(sizeof(DIC)==33*SZI,"DIC not 33 Is");
-#else
-_Static_assert(sizeof(DIC)==34*SZI,"DIC not 34 Is");
-#endif
-#endif
 int getsize_xdic_DIC(void){return (int)sizeof(DIC);} // temp for debugging
 
 #define ST UI4   // type of hash slot