From 0d32715b05611c4a044b60c0c6cc16dd08c8af7a Mon Sep 17 00:00:00 2001
From: "Ahn, Dongkyun" <dongkyun.ahn@intel.com>
Date: Tue, 13 Sep 2022 11:25:08 -0700
Subject: [PATCH 1/2] [SYCL][ESIMD][EMU] LSC Atomic update for emulator backend

- Argument order fix for cmpxchg
---
 SYCL/ESIMD/dword_atomic_cmpxchg.cpp | 4 ++--
 SYCL/ESIMD/dword_atomic_smoke.cpp   | 2 --
 SYCL/ESIMD/lsc/Inputs/lsc_surf.hpp  | 4 ++--
 SYCL/ESIMD/lsc/lsc_slm.cpp          | 4 ++--
 SYCL/ESIMD/lsc/lsc_usm.cpp          | 4 ++--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/SYCL/ESIMD/dword_atomic_cmpxchg.cpp b/SYCL/ESIMD/dword_atomic_cmpxchg.cpp
index 42b98bfe2d..7674af83a7 100644
--- a/SYCL/ESIMD/dword_atomic_cmpxchg.cpp
+++ b/SYCL/ESIMD/dword_atomic_cmpxchg.cpp
@@ -9,8 +9,8 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda || hip
-// TODO: esimd_emulator fails due to unsupported __esimd_svm_atomic0/1/2
-// XFAIL: esimd_emulator
+// TODO: esimd_emulator fails due to random timeouts (_XFAIL_: esimd_emulator)
+// UNSUPPORTED: esimd_emulator
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/ESIMD/dword_atomic_smoke.cpp b/SYCL/ESIMD/dword_atomic_smoke.cpp
index 261710277c..d0fd376413 100644
--- a/SYCL/ESIMD/dword_atomic_smoke.cpp
+++ b/SYCL/ESIMD/dword_atomic_smoke.cpp
@@ -9,8 +9,6 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda || hip
-// TODO: esimd_emulator fails due to unsupported __esimd_svm_atomic0/1/2
-// XFAIL: esimd_emulator
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/ESIMD/lsc/Inputs/lsc_surf.hpp b/SYCL/ESIMD/lsc/Inputs/lsc_surf.hpp
index 2e1f7302e7..14d62c8ed4 100644
--- a/SYCL/ESIMD/lsc/Inputs/lsc_surf.hpp
+++ b/SYCL/ESIMD/lsc/Inputs/lsc_surf.hpp
@@ -75,8 +75,8 @@ int main() {
             lsc_atomic_update<atomic_op::inc, int>(access_2, offsets, pred);
             lsc_atomic_update<atomic_op::add, int>(access_3, offsets, add,
                                                    pred);
-            lsc_atomic_update<atomic_op::cmpxchg, int>(access_4, offsets,
-                                                       compare, swap, pred);
+            lsc_atomic_update<atomic_op::cmpxchg, int>(access_4, offsets, swap,
+                                                       compare, pred);
           });
     });
     q.wait();
diff --git a/SYCL/ESIMD/lsc/lsc_slm.cpp b/SYCL/ESIMD/lsc/lsc_slm.cpp
index cf050bd8b4..1924112888 100644
--- a/SYCL/ESIMD/lsc/lsc_slm.cpp
+++ b/SYCL/ESIMD/lsc/lsc_slm.cpp
@@ -81,8 +81,8 @@ int main() {
             lsc_block_store<int, SIMDSize>(access_3, offset, data_3);
 
             lsc_slm_block_store<int, SIMDSize>(offset, data);
-            lsc_slm_atomic_update<atomic_op::cmpxchg, int>(offsets, compare,
-                                                           swap, pred);
+            lsc_slm_atomic_update<atomic_op::cmpxchg, int>(offsets, swap,
+                                                           compare, pred);
             auto data_4 = lsc_slm_block_load<int, SIMDSize>(offset);
             lsc_block_store<int, SIMDSize>(access_4, offset, data_4);
           });
diff --git a/SYCL/ESIMD/lsc/lsc_usm.cpp b/SYCL/ESIMD/lsc/lsc_usm.cpp
index 4d6e5c501a..f46987f93d 100644
--- a/SYCL/ESIMD/lsc/lsc_usm.cpp
+++ b/SYCL/ESIMD/lsc/lsc_usm.cpp
@@ -69,8 +69,8 @@ int main() {
 
             lsc_atomic_update<atomic_op::inc, int>(vec_2, offsets, pred);
             lsc_atomic_update<atomic_op::add, int>(vec_3, offsets, add, pred);
-            lsc_atomic_update<atomic_op::cmpxchg, int>(vec_4, offsets, compare,
-                                                       swap, pred);
+            lsc_atomic_update<atomic_op::cmpxchg, int>(vec_4, offsets, swap,
+                                                       compare, pred);
           });
     });
     q.wait();

From 9b8a37ad2cbb4d65bee294bc478fbeda8189b202 Mon Sep 17 00:00:00 2001
From: "Ahn, Dongkyun" <dongkyun.ahn@intel.com>
Date: Tue, 13 Sep 2022 12:57:50 -0700
Subject: [PATCH 2/2] Enabling lsc_fence.cpp test

---
 SYCL/ESIMD/lsc/lsc_fence.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SYCL/ESIMD/lsc/lsc_fence.cpp b/SYCL/ESIMD/lsc/lsc_fence.cpp
index 99cc6bc912..400f1295a6 100644
--- a/SYCL/ESIMD/lsc/lsc_fence.cpp
+++ b/SYCL/ESIMD/lsc/lsc_fence.cpp
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// REQUIRES: gpu-intel-pvc
+// REQUIRES: gpu-intel-pvc || esimd_emulator
 // UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out