Skip to content

Commit d69a4c2

Browse files
authored
Revert "[ESIMD][E2E] Enable few cases in atomic_update after gpu driver update" (#12669)
Reverts #12639 This regressed atomic_update_acc_dg2_pvc_cmpxchg.cpp
1 parent dbd65ab commit d69a4c2

File tree

2 files changed

+31
-7
lines changed

2 files changed

+31
-7
lines changed

sycl/test-e2e/ESIMD/unified_memory_api/Inputs/atomic_update.hpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -715,10 +715,13 @@ bool test_int_types_and_sizes(queue q, const Config &cfg) {
715715
q, cfg);
716716
passed &= test_int_types<64, Op, UseMask, UseLSCFeatures, UseAcc, SignMask>(
717717
q, cfg);
718-
passed &= test_int_types<12, Op, UseMask, UseLSCFeatures, UseAcc, SignMask>(
719-
q, cfg);
720-
passed &= test_int_types<33, Op, UseMask, UseLSCFeatures, UseAcc, SignMask>(
721-
q, cfg);
718+
// non power of two values are supported only in newer driver.
719+
// TODO: Enable this when the new driver reaches test infrastructure
720+
// (v27556).
721+
#if 0
722+
passed &= test_int_types<12, Op, UseMask, UseLSCFeatures, UseAcc, SignMask>(q, cfg);
723+
passed &= test_int_types<33, Op, UseMask, UseLSCFeatures, UseAcc, SignMask>(q, cfg);
724+
#endif
722725
}
723726

724727
return passed;
@@ -739,8 +742,13 @@ bool test_fp_types_and_sizes(queue q, const Config &cfg) {
739742
passed &= test_fp_types<32, Op, UseMask, UseLSCFeatures, UseAcc>(q, cfg);
740743
passed &= test_fp_types<64, Op, UseMask, UseLSCFeatures, UseAcc>(q, cfg);
741744

745+
// non power of two values are supported only in newer driver.
746+
// TODO: Enable this when the new driver reaches test infrastructure
747+
// (v27556).
748+
#if 0
742749
passed &= test_fp_types<12, Op, UseMask, UseLSCFeatures, UseAcc>(q, cfg);
743750
passed &= test_fp_types<35, Op, UseMask, UseLSCFeatures, UseAcc>(q, cfg);
751+
#endif
744752
}
745753
return passed;
746754
}

sycl/test-e2e/ESIMD/unified_memory_api/Inputs/atomic_update_slm.hpp

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -612,9 +612,14 @@ bool test_fp_types(queue q) {
612612

613613
if constexpr (Features == TestFeatures::DG2 ||
614614
Features == TestFeatures::PVC) {
615-
if (q.get_device().has(sycl::aspect::atomic64) &&
616-
q.get_device().has(sycl::aspect::fp64)) {
617-
passed &= run_test<UseAcc, double, N, Op, UseMask>(q);
615+
// TODO: fmin/fmax/fcmpxchg for double requires a newer GPU driver.
616+
if constexpr (!std::is_same_v<Op<double, N>, ImplLSCFmax<double, N>> &&
617+
!std::is_same_v<Op<double, N>, ImplLSCFmin<double, N>> &&
618+
!std::is_same_v<Op<double, N>, ImplLSCFcmpwr<double, N>>) {
619+
if (q.get_device().has(sycl::aspect::atomic64) &&
620+
q.get_device().has(sycl::aspect::fp64)) {
621+
passed &= run_test<UseAcc, double, N, Op, UseMask>(q);
622+
}
618623
}
619624
}
620625
return passed;
@@ -628,6 +633,7 @@ bool test_int_types_and_sizes(queue q) {
628633
passed &= test_int_types<2, Op, UseMask, Features, UseAcc, SignMask>(q);
629634
passed &= test_int_types<4, Op, UseMask, Features, UseAcc, SignMask>(q);
630635
passed &= test_int_types<8, Op, UseMask, Features, UseAcc, SignMask>(q);
636+
// TODO: N=16 and N=32 does not pass on Gen12 with mask due to older driver.
631637
if (UseMask && Features == TestFeatures::Generic &&
632638
esimd_test::isGPUDriverGE(q, esimd_test::GPUDriverOS::LinuxAndWindows,
633639
"26918", "101.4953", false)) {
@@ -639,8 +645,13 @@ bool test_int_types_and_sizes(queue q) {
639645
if constexpr (Features == TestFeatures::DG2 ||
640646
Features == TestFeatures::PVC) {
641647
passed &= test_int_types<64, Op, UseMask, Features, UseAcc, SignMask>(q);
648+
// non power of two values are supported only in newer driver.
649+
// TODO: Enable this when the new driver reaches test infrastructure
650+
// (v27556).
651+
#if 0
642652
passed &= test_int_types<12, Op, UseMask, Features, UseAcc, SignMask>(q);
643653
passed &= test_int_types<33, Op, UseMask, Features, UseAcc, SignMask>(q);
654+
#endif
644655
}
645656

646657
return passed;
@@ -661,8 +672,13 @@ bool test_fp_types_and_sizes(queue q) {
661672
if constexpr (Features == TestFeatures::DG2 ||
662673
Features == TestFeatures::PVC) {
663674
passed &= test_fp_types<64, Op, UseMask, Features, UseAcc>(q);
675+
// non power of two values are supported only in newer driver.
676+
// TODO: Enable this when the new driver reaches test infrastructure
677+
// (v27556).
678+
#if 0
664679
passed &= test_fp_types<33, Op, UseMask, Features, UseAcc>(q);
665680
passed &= test_fp_types<65, Op, UseMask, Features, UseAcc>(q);
681+
#endif
666682
}
667683
return passed;
668684
}

0 commit comments

Comments
 (0)