Wrap tests in anon namespace to enable integration in Chromium

Also add HWY_TEST_MAIN for msvc and "// HWY_ONCE",
Fix missing includes,
fix unused-function in targets_test,
workaround SVE2 bug via non-const Iota + require recent Clang.
workaround MSVC timeout by splitting two tests

PiperOrigin-RevId: 686156435

BUILD

@@ -487,12 +487,14 @@ HWY_TESTS = [
     ("hwy/", "targets_test"),
     ("hwy/tests/", "arithmetic_test"),
     ("hwy/tests/", "bit_permute_test"),
+    ("hwy/tests/", "blockwise_combine_test"),
     ("hwy/tests/", "blockwise_shift_test"),
     ("hwy/tests/", "blockwise_test"),
     ("hwy/tests/", "cast_test"),
     ("hwy/tests/", "combine_test"),
     ("hwy/tests/", "compare_test"),
     ("hwy/tests/", "compress_test"),
+    ("hwy/tests/", "concat_test"),
     ("hwy/tests/", "convert_test"),
     ("hwy/tests/", "count_test"),
     ("hwy/tests/", "crypto_test"),

CMakeLists.txt

@@ -721,12 +721,14 @@ set(HWY_TEST_FILES
   hwy/examples/skeleton_test.cc
   hwy/tests/arithmetic_test.cc
   hwy/tests/bit_permute_test.cc
+  hwy/tests/blockwise_combine_test.cc
   hwy/tests/blockwise_shift_test.cc
   hwy/tests/blockwise_test.cc
   hwy/tests/cast_test.cc
   hwy/tests/combine_test.cc
   hwy/tests/compare_test.cc
   hwy/tests/compress_test.cc
+  hwy/tests/concat_test.cc
   hwy/tests/convert_test.cc
   hwy/tests/count_test.cc
   hwy/tests/crypto_test.cc

hwy/abort_test.cc

@@ -13,14 +13,13 @@
 #include "hwy/tests/test_util-inl.h"  // HWY_ASSERT_EQ
 
 namespace hwy {
+namespace {
 
 #ifdef GTEST_HAS_DEATH_TEST
-namespace {
 std::string GetBaseName(std::string const& file_name) {
   auto last_slash = file_name.find_last_of("/\\");
   return file_name.substr(last_slash + 1);
 }
-}  // namespace
 
 TEST(AbortDeathTest, AbortDefault) {
   std::string expected = std::string("Abort at ") + GetBaseName(__FILE__) +
@@ -68,6 +67,7 @@ TEST(AbortTest, AbortOverrideChain) {
   HWY_ASSERT(GetAbortFunc() == nullptr);
 }
 
+}  // namespace
 }  // namespace hwy
 
 HWY_TEST_MAIN();

hwy/aligned_allocator_test.cc

@@ -84,6 +84,7 @@ class FakeAllocator {
 }  // namespace
 
 namespace hwy {
+namespace {
 
 #if !HWY_TEST_STANDALONE
 class AlignedAllocatorTest : public testing::Test {};
@@ -283,8 +284,6 @@ TEST(AlignedAllocatorTest, TestDefaultInit) {
                 (addr2 >> (kBits - 1)) >> (kBits - 1));
 }
 
-namespace {
-
 using std::array;
 using std::vector;
 

hwy/base_test.cc

@@ -26,6 +26,7 @@
 HWY_BEFORE_NAMESPACE();
 namespace hwy {
 namespace HWY_NAMESPACE {
+namespace {
 
 HWY_NOINLINE void TestAllLimits() {
   HWY_ASSERT_EQ(uint8_t{0}, LimitsMin<uint8_t>());
@@ -837,14 +838,15 @@ HWY_NOINLINE void TestAllSpecialFloat() {
   test(bfloat16_t());
 }
 
+}  // namespace
 // NOLINTNEXTLINE(google-readability-namespace-comments)
 }  // namespace HWY_NAMESPACE
 }  // namespace hwy
 HWY_AFTER_NAMESPACE();
 
 #if HWY_ONCE
-
 namespace hwy {
+namespace {
 HWY_BEFORE_TEST(BaseTest);
 HWY_EXPORT_AND_TEST_P(BaseTest, TestAllLimits);
 HWY_EXPORT_AND_TEST_P(BaseTest, TestAllLowestHighest);
@@ -858,6 +860,7 @@ HWY_EXPORT_AND_TEST_P(BaseTest, TestAllMul128);
 HWY_EXPORT_AND_TEST_P(BaseTest, TestAllEndian);
 HWY_EXPORT_AND_TEST_P(BaseTest, TestAllSpecialFloat);
 HWY_AFTER_TEST();
+}  // namespace
 }  // namespace hwy
-
-#endif
+HWY_TEST_MAIN();
+#endif  // HWY_ONCE

hwy/contrib/algo/copy_test.cc

@@ -37,6 +37,7 @@
 HWY_BEFORE_NAMESPACE();
 namespace hwy {
 namespace HWY_NAMESPACE {
+namespace {
 
 // Returns random integer in [0, 128), which fits in any lane type.
 template <typename T>
@@ -189,19 +190,21 @@ void TestAllCopyIf() {
   ForUI163264(ForPartialVectors<ForeachCountAndMisalign<TestCopyIf>>());
 }
 
+}  // namespace
 // NOLINTNEXTLINE(google-readability-namespace-comments)
 }  // namespace HWY_NAMESPACE
 }  // namespace hwy
 HWY_AFTER_NAMESPACE();
 
 #if HWY_ONCE
-
 namespace hwy {
+namespace {
 HWY_BEFORE_TEST(CopyTest);
 HWY_EXPORT_AND_TEST_P(CopyTest, TestAllFill);
 HWY_EXPORT_AND_TEST_P(CopyTest, TestAllCopy);
 HWY_EXPORT_AND_TEST_P(CopyTest, TestAllCopyIf);
 HWY_AFTER_TEST();
+}  // namespace
 }  // namespace hwy
-
-#endif
+HWY_TEST_MAIN();
+#endif  // HWY_ONCE

hwy/contrib/algo/find_test.cc

@@ -42,6 +42,7 @@
 HWY_BEFORE_NAMESPACE();
 namespace hwy {
 namespace HWY_NAMESPACE {
+namespace {
 
 // Returns random number in [-8, 8] - we use knowledge of the range to Find()
 // values we know are not present.
@@ -210,18 +211,20 @@ void TestAllFindIf() {
   ForAllTypes(ForPartialVectors<ForeachCountAndMisalign<TestFindIf>>());
 }
 
+}  // namespace
 // NOLINTNEXTLINE(google-readability-namespace-comments)
 }  // namespace HWY_NAMESPACE
 }  // namespace hwy
 HWY_AFTER_NAMESPACE();
 
 #if HWY_ONCE
-
 namespace hwy {
+namespace {
 HWY_BEFORE_TEST(FindTest);
 HWY_EXPORT_AND_TEST_P(FindTest, TestAllFind);
 HWY_EXPORT_AND_TEST_P(FindTest, TestAllFindIf);
 HWY_AFTER_TEST();
+}  // namespace
 }  // namespace hwy
-
-#endif
+HWY_TEST_MAIN();
+#endif  // HWY_ONCE

hwy/contrib/algo/transform_test.cc

@@ -40,6 +40,7 @@
 HWY_BEFORE_NAMESPACE();
 namespace hwy {
 namespace HWY_NAMESPACE {
+namespace {
 
 constexpr double kAlpha = 1.5;  // arbitrary scalar
 
@@ -440,14 +441,15 @@ void TestAllReplace() {
   ForFloatTypes(ForPartialVectors<ForeachCountAndMisalign<TestReplace>>());
 }
 
+}  // namespace
 // NOLINTNEXTLINE(google-readability-namespace-comments)
 }  // namespace HWY_NAMESPACE
 }  // namespace hwy
 HWY_AFTER_NAMESPACE();
 
 #if HWY_ONCE
-
 namespace hwy {
+namespace {
 HWY_BEFORE_TEST(TransformTest);
 HWY_EXPORT_AND_TEST_P(TransformTest, TestAllGenerate);
 HWY_EXPORT_AND_TEST_P(TransformTest, TestAllForeach);
@@ -456,6 +458,7 @@ HWY_EXPORT_AND_TEST_P(TransformTest, TestAllTransform1);
 HWY_EXPORT_AND_TEST_P(TransformTest, TestAllTransform2);
 HWY_EXPORT_AND_TEST_P(TransformTest, TestAllReplace);
 HWY_AFTER_TEST();
+}  // namespace
 }  // namespace hwy
-
-#endif
+HWY_TEST_MAIN();
+#endif  // HWY_ONCE

hwy/contrib/bit_pack/bit_pack_test.cc

@@ -48,6 +48,7 @@ size_t last_bits = 0;
 uint64_t best_target = ~0ull;
 #endif
 namespace HWY_NAMESPACE {
+namespace {
 
 template <size_t kBits, typename T>
 T Random(RandomState& rng) {
@@ -222,20 +223,22 @@ void TestAllPack64() {
 #endif
 }
 
+}  // namespace
 // NOLINTNEXTLINE(google-readability-namespace-comments)
 }  // namespace HWY_NAMESPACE
 }  // namespace hwy
 HWY_AFTER_NAMESPACE();
 
 #if HWY_ONCE
-
 namespace hwy {
+namespace {
 HWY_BEFORE_TEST(BitPackTest);
 HWY_EXPORT_AND_TEST_P(BitPackTest, TestAllPack8);
 HWY_EXPORT_AND_TEST_P(BitPackTest, TestAllPack16);
 HWY_EXPORT_AND_TEST_P(BitPackTest, TestAllPack32);
 HWY_EXPORT_AND_TEST_P(BitPackTest, TestAllPack64);
 HWY_AFTER_TEST();
+}  // namespace
 }  // namespace hwy
-
-#endif
+HWY_TEST_MAIN();
+#endif  // HWY_ONCE

hwy/contrib/dot/dot_test.cc

@@ -32,6 +32,7 @@
 HWY_BEFORE_NAMESPACE();
 namespace hwy {
 namespace HWY_NAMESPACE {
+namespace {
 
 template <typename T1, typename T2>
 HWY_NOINLINE T1 SimpleDot(const T1* pa, const T2* pb, size_t num) {
@@ -269,19 +270,21 @@ void TestAllDotF32BF16() {
 // Both bf16.
 void TestAllDotBF16() { ForShrinkableVectors<TestDot>()(bfloat16_t()); }
 
+}  // namespace
 // NOLINTNEXTLINE(google-readability-namespace-comments)
 }  // namespace HWY_NAMESPACE
 }  // namespace hwy
 HWY_AFTER_NAMESPACE();
 
 #if HWY_ONCE
-
 namespace hwy {
+namespace {
 HWY_BEFORE_TEST(DotTest);
 HWY_EXPORT_AND_TEST_P(DotTest, TestAllDot);
 HWY_EXPORT_AND_TEST_P(DotTest, TestAllDotF32BF16);
 HWY_EXPORT_AND_TEST_P(DotTest, TestAllDotBF16);
 HWY_AFTER_TEST();
+}  // namespace
 }  // namespace hwy
-
-#endif
+HWY_TEST_MAIN();
+#endif  // HWY_ONCE

hwy/contrib/image/image_test.cc

@@ -30,6 +30,7 @@
 HWY_BEFORE_NAMESPACE();
 namespace hwy {
 namespace HWY_NAMESPACE {
+namespace {
 
 // Ensure we can always write full aligned vectors.
 struct TestAlignedT {
@@ -133,18 +134,20 @@ struct TestUnalignedT {
 
 void TestUnaligned() { ForUnsignedTypes(TestUnalignedT()); }
 
+}  // namespace
 // NOLINTNEXTLINE(google-readability-namespace-comments)
 }  // namespace HWY_NAMESPACE
 }  // namespace hwy
 HWY_AFTER_NAMESPACE();
 
 #if HWY_ONCE
-
 namespace hwy {
+namespace {
 HWY_BEFORE_TEST(ImageTest);
 HWY_EXPORT_AND_TEST_P(ImageTest, TestAligned);
 HWY_EXPORT_AND_TEST_P(ImageTest, TestUnaligned);
 HWY_AFTER_TEST();
+}  // namespace
 }  // namespace hwy
-
-#endif
+HWY_TEST_MAIN();
+#endif  // HWY_ONCE

hwy/contrib/math/math_test.cc

@@ -34,6 +34,7 @@
 HWY_BEFORE_NAMESPACE();
 namespace hwy {
 namespace HWY_NAMESPACE {
+namespace {
 
 // We have had test failures caused by excess precision due to keeping
 // intermediate results in 80-bit x87 registers. One such failure mode is that
@@ -625,14 +626,15 @@ HWY_NOINLINE void TestAllHypot() {
   ForFloat3264Types(ForPartialVectors<TestHypot>());
 }
 
+}  // namespace
 // NOLINTNEXTLINE(google-readability-namespace-comments)
 }  // namespace HWY_NAMESPACE
 }  // namespace hwy
 HWY_AFTER_NAMESPACE();
 
 #if HWY_ONCE
-
 namespace hwy {
+namespace {
 HWY_BEFORE_TEST(HwyMathTest);
 HWY_EXPORT_AND_TEST_P(HwyMathTest, TestAllAcos);
 HWY_EXPORT_AND_TEST_P(HwyMathTest, TestAllAcosh);
@@ -656,6 +658,7 @@ HWY_EXPORT_AND_TEST_P(HwyMathTest, TestAllSinCosSin);
 HWY_EXPORT_AND_TEST_P(HwyMathTest, TestAllSinCosCos);
 HWY_EXPORT_AND_TEST_P(HwyMathTest, TestAllHypot);
 HWY_AFTER_TEST();
+}  // namespace
 }  // namespace hwy
-
-#endif
+HWY_TEST_MAIN();
+#endif  // HWY_ONCE

hwy/contrib/matvec/matvec_test.cc

@@ -42,6 +42,7 @@
 HWY_BEFORE_NAMESPACE();
 namespace hwy {
 namespace HWY_NAMESPACE {
+namespace {
 
 template <typename MatT, typename T>
 HWY_NOINLINE void SimpleMatVecAdd(const MatT* HWY_RESTRICT mat,
@@ -272,19 +273,21 @@ void TestAllMatVecBF16Both() {
   ForGEVectors<32, TestMatVecAdd<bfloat16_t, bfloat16_t>>()(float());
 }
 
+}  // namespace
 // NOLINTNEXTLINE(google-readability-namespace-comments)
 }  // namespace HWY_NAMESPACE
 }  // namespace hwy
 HWY_AFTER_NAMESPACE();
 
 #if HWY_ONCE
-
 namespace hwy {
+namespace {
 HWY_BEFORE_TEST(MatVecTest);
 HWY_EXPORT_AND_TEST_P(MatVecTest, TestAllMatVecAdd);
 HWY_EXPORT_AND_TEST_P(MatVecTest, TestAllMatVecBF16);
 HWY_EXPORT_AND_TEST_P(MatVecTest, TestAllMatVecBF16Both);
 HWY_AFTER_TEST();
+}  // namespace
 }  // namespace hwy
-
+HWY_TEST_MAIN();
 #endif  // HWY_ONCE