From fab8e8ce7acc86aba4cc26bfc1775ade2c6ab1d8 Mon Sep 17 00:00:00 2001
From: fineg74 <61437305+fineg74@users.noreply.github.com>
Date: Tue, 5 Dec 2023 12:39:21 -0800
Subject: [PATCH] [ESIMD] Reenable previously disabled private memory tests
 that are passing. (#12072)

Move all private memory tests to a single folder
---
 sycl/test-e2e/ESIMD/noinline_call_from_func.cpp                 | 2 --
 sycl/test-e2e/ESIMD/private_memory/pm_access_1.cpp              | 2 --
 sycl/test-e2e/ESIMD/private_memory/pm_access_2.cpp              | 2 --
 sycl/test-e2e/ESIMD/private_memory/pm_access_3.cpp              | 2 --
 sycl/test-e2e/ESIMD/{ => private_memory}/private_memory.cpp     | 2 +-
 sycl/test-e2e/ESIMD/{ => private_memory}/private_memory_pvc.cpp | 0
 6 files changed, 1 insertion(+), 9 deletions(-)
 rename sycl/test-e2e/ESIMD/{ => private_memory}/private_memory.cpp (98%)
 rename sycl/test-e2e/ESIMD/{ => private_memory}/private_memory_pvc.cpp (100%)

diff --git a/sycl/test-e2e/ESIMD/noinline_call_from_func.cpp b/sycl/test-e2e/ESIMD/noinline_call_from_func.cpp
index 2eadfadff9b96..731a5123d03f2 100644
--- a/sycl/test-e2e/ESIMD/noinline_call_from_func.cpp
+++ b/sycl/test-e2e/ESIMD/noinline_call_from_func.cpp
@@ -7,8 +7,6 @@
 //===----------------------------------------------------------------------===//
 // Test currently timeouts on Windows Level Zero and OpenCL
 // UNSUPPORTED: windows
-// Temporarily disabled due to flaky behavior
-// REQUIRES: TEMPORARY_DISABLED
 // RUN: %{build} -o %t.out
 // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %{run} %t.out
 //
diff --git a/sycl/test-e2e/ESIMD/private_memory/pm_access_1.cpp b/sycl/test-e2e/ESIMD/private_memory/pm_access_1.cpp
index ce09eed53f1a8..96fcc387bb4d0 100644
--- a/sycl/test-e2e/ESIMD/private_memory/pm_access_1.cpp
+++ b/sycl/test-e2e/ESIMD/private_memory/pm_access_1.cpp
@@ -6,7 +6,5 @@
 //
 //===----------------------------------------------------------------------===//
 
-// Temporarily disabled due to flaky behavior
-// REQUIRES: TEMPORARY_DISABLED
 // RUN: %clangxx -fsycl -Xs "-stateless-stack-mem-size=131072" -I%S/.. %S/Inputs/pm_common.cpp -o %t.out
 // RUN: %{run} %t.out 1
diff --git a/sycl/test-e2e/ESIMD/private_memory/pm_access_2.cpp b/sycl/test-e2e/ESIMD/private_memory/pm_access_2.cpp
index 0109087a13722..fc19edd4484b3 100644
--- a/sycl/test-e2e/ESIMD/private_memory/pm_access_2.cpp
+++ b/sycl/test-e2e/ESIMD/private_memory/pm_access_2.cpp
@@ -6,7 +6,5 @@
 //
 //===----------------------------------------------------------------------===//
 
-// Temporarily disabled due to flaky behavior
-// REQUIRES: TEMPORARY_DISABLED
 // RUN: %clangxx -fsycl -Xs "-stateless-stack-mem-size=131072" -I%S/.. %S/Inputs/pm_common.cpp -o %t.out
 // RUN: %{run} %t.out 2
diff --git a/sycl/test-e2e/ESIMD/private_memory/pm_access_3.cpp b/sycl/test-e2e/ESIMD/private_memory/pm_access_3.cpp
index c6497f5a55364..bab2d30269ce7 100644
--- a/sycl/test-e2e/ESIMD/private_memory/pm_access_3.cpp
+++ b/sycl/test-e2e/ESIMD/private_memory/pm_access_3.cpp
@@ -6,7 +6,5 @@
 //
 //===----------------------------------------------------------------------===//
 
-// Temporarily disabled due to flaky behavior
-// REQUIRES: TEMPORARY_DISABLED
 // RUN: %clangxx -fsycl -Xs "-stateless-stack-mem-size=131072" -I%S/.. %S/Inputs/pm_common.cpp -o %t.out
 // RUN: %{run} %t.out 3
diff --git a/sycl/test-e2e/ESIMD/private_memory.cpp b/sycl/test-e2e/ESIMD/private_memory/private_memory.cpp
similarity index 98%
rename from sycl/test-e2e/ESIMD/private_memory.cpp
rename to sycl/test-e2e/ESIMD/private_memory/private_memory.cpp
index ad0a10984052e..f3a377670166f 100644
--- a/sycl/test-e2e/ESIMD/private_memory.cpp
+++ b/sycl/test-e2e/ESIMD/private_memory/private_memory.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 // UNSUPPORTED: gpu-intel-pvc
 
-// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -I%S/.. -o %t.out
 // RUN: %{run} %t.out
 
 // The test verifies that basic ESIMD API works properly with
diff --git a/sycl/test-e2e/ESIMD/private_memory_pvc.cpp b/sycl/test-e2e/ESIMD/private_memory/private_memory_pvc.cpp
similarity index 100%
rename from sycl/test-e2e/ESIMD/private_memory_pvc.cpp
rename to sycl/test-e2e/ESIMD/private_memory/private_memory_pvc.cpp