Simplify assertions

Optimize x64 codegen for bucket scans
dotnet · kg · Apr 15, 2024 · Mar 27, 2024 · Mar 27, 2024 · Mar 27, 2024
commit 703a607890a498c084ca8cf63a40963cf554c402
diff --git a/src/mono/mono.proj b/src/mono/mono.proj
@@ -280,8 +280,6 @@
       <_MonoCMakeArgs Include="-DGC_SUSPEND=$(MonoThreadSuspend)" />
       <_MonoCMakeArgs Include="-DMONO_LIB_NAME=$(MonoLibName)" />
       <_MonoCMakeArgs Include="-DMONO_SHARED_LIB_NAME=$(MonoSharedLibName)" />
-
-      <_MonoCFLAGS Include="-DDN_SIMDHASH_USE_MONO_ASSERTION_MESSAGE=1" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(HostOS)' == 'Linux' and '$(MonoEnableLLVM)' == 'true' and '$(TargetArchitecture)' != 'wasm' and '$(MonoUseLibCxx)' == 'true'">

diff --git a/src/native/containers/dn-simdhash-specialization.h b/src/native/containers/dn-simdhash-specialization.h
@@ -130,14 +130,13 @@ address_of_value (dn_simdhash_buffers_t buffers, uint32_t value_slot_index)
 static DN_FORCEINLINE(int)
 DN_SIMDHASH_SCAN_BUCKET_INTERNAL (DN_SIMDHASH_T_PTR hash, bucket_t *bucket, DN_SIMDHASH_KEY_T needle, dn_simdhash_search_vector search_vector)
 {
-#ifdef DN_SIMDHASH_USE_SCALAR_FALLBACK
-	// An eager load in scalar mode just does two 8-byte copies from the keys table to the stack.
-	// There's no point in doing it.
-	#define bucket_suffixes (bucket->suffixes)
-#else
-	// Performing an up-front load of the vector here enables clang to use extract_lane_u
-	//  to load the count on WASM instead of doing a separate load8_u operation from memory
+#if defined(__wasm_simd128__)
+	// Perform an eager load of the vector on wasm
 	dn_simdhash_suffixes bucket_suffixes = bucket->suffixes;
+#else
+	// Load through the pointer instead; if we eager load the vector on x64 clang,
+	//  it does lane extraction via pshufd and stuff - the code is truly heinous
+	#define bucket_suffixes (bucket->suffixes)
 #endif
 	uint8_t count = dn_simdhash_extract_lane(bucket_suffixes, DN_SIMDHASH_COUNT_SLOT),
 		overflow_count = dn_simdhash_extract_lane(bucket_suffixes, DN_SIMDHASH_CASCADED_SLOT);

diff --git a/src/native/containers/dn-simdhash-utils.h b/src/native/containers/dn-simdhash-utils.h
@@ -178,25 +178,9 @@ MurmurHash3_32_streaming (const uint8_t *key, uint32_t seed)
 
 // end of reformulated murmur3-32
 
-
-#if DN_SIMDHASH_USE_MONO_ASSERTION_MESSAGE
-
-void
-mono_assertion_message (const char *file, int line, const char *condition);
-
-static inline void
-dn_simdhash_assert_fail (const char *file, int line, const char *condition)
-{
-	return mono_assertion_message(file, line, condition);
-}
-
-#else
-
 void
 dn_simdhash_assert_fail (const char *file, int line, const char *condition);
 
-#endif
-
 #define dn_simdhash_assert(expr) \
 	if (DN_UNLIKELY(!(expr))) { \
 		dn_simdhash_assert_fail(__FILE__, __LINE__, #expr); \