Merge pull request #224 from hvdijk/arm-reenable-tests

Re-enable a bunch of tests.
uxlfoundation · Nov 21, 2023 · 7ce82c7 · 7ce82c7
2 parents aed45b0 + e02968f
commit 7ce82c7
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 232 deletions.
diff --git a/source/cl/test/UnitCL/source/ktst_conversions.cpp b/source/cl/test/UnitCL/source/ktst_conversions.cpp
@@ -1027,15 +1027,6 @@ TEST_P(HalfToCharExplicitConvert, Conversion_04_Explicit_Convert) {
   // TODO: Investigate why this test doesn't vectorize (CA-4552).
   fail_if_not_vectorized_ = false;
 
-  // TODO: CA-2731: With a vector width of 2, only rounding mode `NONE` works
-#ifdef __arm__
-  unsigned width{};
-  RoundingMode rnd{};
-  std::tie(width, std::ignore, rnd) = getParam();
-  if (width == 2 && rnd != RoundingMode::NONE) {
-    GTEST_SKIP();
-  }
-#endif
   Run<CLhalf, CLchar>();
 }
 UCL_EXECUTION_TEST_SUITE_P(HalfToCharExplicitConvert, testing::Values(OPENCL_C),
@@ -1060,15 +1051,6 @@ TEST_P(HalfToUcharExplicitConvert, Conversion_04_Explicit_Convert) {
   // TODO: Investigate why this test doesn't vectorize (CA-4552).
   fail_if_not_vectorized_ = false;
 
-  // TODO: CA-2731: With a vector width of 2, only rounding mode `NONE` works
-#ifdef __arm__
-  unsigned width{};
-  RoundingMode rnd{};
-  std::tie(width, std::ignore, rnd) = getParam();
-  if (width == 2 && rnd != RoundingMode::NONE) {
-    GTEST_SKIP();
-  }
-#endif
   Run<CLhalf, CLuchar>();
 }
 UCL_EXECUTION_TEST_SUITE_P(HalfToUcharExplicitConvert,
@@ -1095,15 +1077,6 @@ TEST_P(HalfToShortExplicitConvert, Conversion_04_Explicit_Convert) {
   // TODO: Investigate why this test doesn't vectorize (CA-4552).
   fail_if_not_vectorized_ = false;
 
-  // TODO: CA-2731: With a vector width of 2, only rounding mode `NONE` works
-#ifdef __arm__
-  unsigned width{};
-  RoundingMode rnd{};
-  std::tie(width, std::ignore, rnd) = getParam();
-  if (width == 2 && rnd != RoundingMode::NONE) {
-    GTEST_SKIP();
-  }
-#endif
   Run<CLhalf, CLshort>();
 }
 UCL_EXECUTION_TEST_SUITE_P(HalfToShortExplicitConvert,
@@ -1130,15 +1103,6 @@ TEST_P(HalfToUshortExplicitConvert, Conversion_04_Explicit_Convert) {
   // TODO: Investigate why this test doesn't vectorize (CA-4552).
   fail_if_not_vectorized_ = false;
 
-  // TODO: CA-2731: With a vector width of 2, only rounding mode `NONE` works
-#ifdef __arm__
-  unsigned width{};
-  RoundingMode rnd{};
-  std::tie(width, std::ignore, rnd) = getParam();
-  if (width == 2 && rnd != RoundingMode::NONE) {
-    GTEST_SKIP();
-  }
-#endif
   Run<CLhalf, CLushort>();
 }
 UCL_EXECUTION_TEST_SUITE_P(HalfToUshortExplicitConvert,
@@ -1165,15 +1129,6 @@ TEST_P(HalfToIntExplicitConvert, Conversion_04_Explicit_Convert) {
   // TODO: Investigate why this test doesn't vectorize (CA-4552).
   fail_if_not_vectorized_ = false;
 
-  // TODO: CA-2731: With a vector width of 2, only rounding mode `NONE` works
-#ifdef __arm__
-  unsigned width{};
-  RoundingMode rnd{};
-  std::tie(width, std::ignore, rnd) = getParam();
-  if (width == 2 && rnd != RoundingMode::NONE) {
-    GTEST_SKIP();
-  }
-#endif
   Run<CLhalf, CLint>();
 }
 UCL_EXECUTION_TEST_SUITE_P(HalfToIntExplicitConvert, testing::Values(OPENCL_C),
@@ -1198,15 +1153,6 @@ TEST_P(HalfToUintExplicitConvert, Conversion_04_Explicit_Convert) {
   // TODO: Investigate why this test doesn't vectorize (CA-4552).
   fail_if_not_vectorized_ = false;
 
-  // TODO: CA-2731: With a vector width of 2, only rounding mode `NONE` works
-#ifdef __arm__
-  unsigned width{};
-  RoundingMode rnd{};
-  std::tie(width, std::ignore, rnd) = getParam();
-  if (width == 2 && rnd != RoundingMode::NONE) {
-    GTEST_SKIP();
-  }
-#endif
   Run<CLhalf, CLuint>();
 }
 UCL_EXECUTION_TEST_SUITE_P(HalfToUintExplicitConvert, testing::Values(OPENCL_C),
@@ -1231,15 +1177,6 @@ TEST_P(HalfToLongExplicitConvert, Conversion_04_Explicit_Convert) {
   // TODO: Investigate why this test doesn't vectorize (CA-4552).
   fail_if_not_vectorized_ = false;
 
-  // TODO: CA-2731: With a vector width of 2, only rounding mode `NONE` works
-#ifdef __arm__
-  unsigned width{};
-  RoundingMode rnd{};
-  std::tie(width, std::ignore, rnd) = getParam();
-  if (width == 2 && rnd != RoundingMode::NONE) {
-    GTEST_SKIP();
-  }
-#endif
   Run<CLhalf, CLlong>();
 }
 UCL_EXECUTION_TEST_SUITE_P(HalfToLongExplicitConvert, testing::Values(OPENCL_C),
@@ -1264,15 +1201,6 @@ TEST_P(HalfToUlongExplicitConvert, Conversion_04_Explicit_Convert) {
   // TODO: Investigate why this test doesn't vectorize (CA-4552).
   fail_if_not_vectorized_ = false;
 
-  // TODO: CA-2731: With a vector width of 2, only rounding mode `NONE` works
-#ifdef __arm__
-  unsigned width{};
-  RoundingMode rnd{};
-  std::tie(width, std::ignore, rnd) = getParam();
-  if (width == 2 && rnd != RoundingMode::NONE) {
-    GTEST_SKIP();
-  }
-#endif
   Run<CLhalf, CLulong>();
 }
 UCL_EXECUTION_TEST_SUITE_P(HalfToUlongExplicitConvert,

diff --git a/source/cl/test/UnitCL/source/ktst_geometric.cpp b/source/cl/test/UnitCL/source/ktst_geometric.cpp
@@ -445,13 +445,6 @@ TEST_P(HalfGeometricBuiltins, DISABLED_Geometric_04_Half_Normalize) {
   if (!UCL::hasHalfSupport(device)) {
     GTEST_SKIP();
   }
-  // TODO: CA-4428: Fix (half) normalize due to overflow issues on dot
-  // TODO: CA-2731: Vector width 2 doesn't work
-#ifdef __arm__
-  if (getParam() == 2) {
-    GTEST_SKIP();
-  }
-#endif
 
   fail_if_not_vectorized_ = false;