From 802726624658c4e1a721afc13d7c9473f2665412 Mon Sep 17 00:00:00 2001
From: Nick Sarnie <sarnex@users.noreply.github.com>
Date: Thu, 7 Mar 2024 01:22:24 +0900
Subject: [PATCH] [SYCL][ESIMD][E2E] Remove force O2 from tests (#12911)

They all pass now, I tested on Gen12 and PVC.

Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
---
 sycl/test-e2e/ESIMD/BitonicSortK.cpp                           | 3 +--
 sycl/test-e2e/ESIMD/BitonicSortKv2.cpp                         | 3 +--
 sycl/test-e2e/ESIMD/InlineAsm/asm_glb.cpp                      | 3 +--
 sycl/test-e2e/ESIMD/PrefixSum.cpp                              | 3 +--
 sycl/test-e2e/ESIMD/Prefix_Local_sum2.cpp                      | 3 +--
 sycl/test-e2e/ESIMD/Prefix_Local_sum3.cpp                      | 3 +--
 sycl/test-e2e/ESIMD/Stencil.cpp                                | 3 +--
 sycl/test-e2e/ESIMD/acc_gather_scatter_rgba.cpp                | 3 +--
 sycl/test-e2e/ESIMD/acc_gather_scatter_rgba_stateless.cpp      | 3 +--
 sycl/test-e2e/ESIMD/accessor_gather_scatter.cpp                | 3 +--
 sycl/test-e2e/ESIMD/accessor_gather_scatter_stateless.cpp      | 3 +--
 sycl/test-e2e/ESIMD/accessor_stateless.cpp                     | 3 +--
 sycl/test-e2e/ESIMD/api/bin_and_cmp_ops_heavy.cpp              | 3 +--
 sycl/test-e2e/ESIMD/api/esimd_pack_unpack_mask.cpp             | 3 +--
 sycl/test-e2e/ESIMD/api/esimd_rgba_smoke.cpp                   | 3 +--
 sycl/test-e2e/ESIMD/api/esimd_rgba_smoke_64.cpp                | 3 +--
 .../functional/functions/functions_select_lvalue_fp_extra.cpp  | 3 +--
 sycl/test-e2e/ESIMD/api/simd_any_all.cpp                       | 3 +--
 sycl/test-e2e/ESIMD/api/simd_copy_to_from.cpp                  | 3 +--
 sycl/test-e2e/ESIMD/api/simd_mask.cpp                          | 3 +--
 sycl/test-e2e/ESIMD/api/simd_memory_access.cpp                 | 3 +--
 sycl/test-e2e/ESIMD/api/simd_view_select_2d_fp.cpp             | 3 +--
 sycl/test-e2e/ESIMD/api/simd_view_select_2d_int.cpp            | 3 +--
 sycl/test-e2e/ESIMD/api/slm_gather_scatter.cpp                 | 3 +--
 sycl/test-e2e/ESIMD/api/svm_gather_scatter.cpp                 | 3 +--
 sycl/test-e2e/ESIMD/api/svm_gather_scatter_64.cpp              | 3 +--
 sycl/test-e2e/ESIMD/api/unary_ops_heavy.cpp                    | 3 +--
 sycl/test-e2e/ESIMD/histogram.cpp                              | 3 +--
 sycl/test-e2e/ESIMD/histogram_256_slm.cpp                      | 3 +--
 sycl/test-e2e/ESIMD/histogram_256_slm_spec_2020.cpp            | 3 +--
 sycl/test-e2e/ESIMD/histogram_2d.cpp                           | 3 +--
 sycl/test-e2e/ESIMD/histogram_2d_64.cpp                        | 3 +--
 sycl/test-e2e/ESIMD/histogram_64.cpp                           | 3 +--
 sycl/test-e2e/ESIMD/imulh_umulh.cpp                            | 3 +--
 sycl/test-e2e/ESIMD/kmeans/kmeans.cpp                          | 3 +--
 sycl/test-e2e/ESIMD/linear/linear.cpp                          | 3 +--
 sycl/test-e2e/ESIMD/matrix_transpose_glb.cpp                   | 3 +--
 sycl/test-e2e/ESIMD/matrix_transpose_usm.cpp                   | 3 +--
 sycl/test-e2e/ESIMD/radix_sort.cpp                             | 3 +--
 sycl/test-e2e/ESIMD/reduction.cpp                              | 3 +--
 sycl/test-e2e/ESIMD/regression/bit_shift_compilation_test.cpp  | 3 +--
 sycl/test-e2e/ESIMD/regression/copyto_char_test.cpp            | 2 +-
 sycl/test-e2e/ESIMD/regression/tanh_fix_test.cpp               | 3 +--
 sycl/test-e2e/ESIMD/regression/usm_gather_scatter_32.cpp       | 3 +--
 sycl/test-e2e/ESIMD/slm_barrier.cpp                            | 3 +--
 sycl/test-e2e/ESIMD/slm_split_barrier.cpp                      | 3 +--
 sycl/test-e2e/ESIMD/usm_gather_scatter_rgba.cpp                | 3 +--
 sycl/test-e2e/ESIMD/usm_gather_scatter_rgba_64.cpp             | 3 +--
 sycl/test-e2e/ESIMD/vadd_usm.cpp                               | 3 +--
 49 files changed, 49 insertions(+), 97 deletions(-)

diff --git a/sycl/test-e2e/ESIMD/BitonicSortK.cpp b/sycl/test-e2e/ESIMD/BitonicSortK.cpp
index bc35bd2cae53..f8e931606b81 100644
--- a/sycl/test-e2e/ESIMD/BitonicSortK.cpp
+++ b/sycl/test-e2e/ESIMD/BitonicSortK.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include "BitonicSortK.hpp"
diff --git a/sycl/test-e2e/ESIMD/BitonicSortKv2.cpp b/sycl/test-e2e/ESIMD/BitonicSortKv2.cpp
index 386b0bbaffeb..e42472e515a9 100644
--- a/sycl/test-e2e/ESIMD/BitonicSortKv2.cpp
+++ b/sycl/test-e2e/ESIMD/BitonicSortKv2.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include "BitonicSortKv2.hpp"
diff --git a/sycl/test-e2e/ESIMD/InlineAsm/asm_glb.cpp b/sycl/test-e2e/ESIMD/InlineAsm/asm_glb.cpp
index 6d6158e84d48..54ca257fb95e 100644
--- a/sycl/test-e2e/ESIMD/InlineAsm/asm_glb.cpp
+++ b/sycl/test-e2e/ESIMD/InlineAsm/asm_glb.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Force -O2 as it currently fails in O0 due to missing VC support
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include "../esimd_test_utils.hpp"
diff --git a/sycl/test-e2e/ESIMD/PrefixSum.cpp b/sycl/test-e2e/ESIMD/PrefixSum.cpp
index c6bf0ec8c374..8cd06bc892cc 100644
--- a/sycl/test-e2e/ESIMD/PrefixSum.cpp
+++ b/sycl/test-e2e/ESIMD/PrefixSum.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out 20
 
 #include "esimd_test_utils.hpp"
diff --git a/sycl/test-e2e/ESIMD/Prefix_Local_sum2.cpp b/sycl/test-e2e/ESIMD/Prefix_Local_sum2.cpp
index 0112fce383da..0c4222f6e6fb 100644
--- a/sycl/test-e2e/ESIMD/Prefix_Local_sum2.cpp
+++ b/sycl/test-e2e/ESIMD/Prefix_Local_sum2.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out 20
 
 #include "esimd_test_utils.hpp"
diff --git a/sycl/test-e2e/ESIMD/Prefix_Local_sum3.cpp b/sycl/test-e2e/ESIMD/Prefix_Local_sum3.cpp
index 9eddad6e96f3..0f77a28569f2 100644
--- a/sycl/test-e2e/ESIMD/Prefix_Local_sum3.cpp
+++ b/sycl/test-e2e/ESIMD/Prefix_Local_sum3.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include "esimd_test_utils.hpp"
diff --git a/sycl/test-e2e/ESIMD/Stencil.cpp b/sycl/test-e2e/ESIMD/Stencil.cpp
index 9486eaba555c..db5d2b896e3f 100644
--- a/sycl/test-e2e/ESIMD/Stencil.cpp
+++ b/sycl/test-e2e/ESIMD/Stencil.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include "esimd_test_utils.hpp"
diff --git a/sycl/test-e2e/ESIMD/acc_gather_scatter_rgba.cpp b/sycl/test-e2e/ESIMD/acc_gather_scatter_rgba.cpp
index c2570333716f..205584eff285 100644
--- a/sycl/test-e2e/ESIMD/acc_gather_scatter_rgba.cpp
+++ b/sycl/test-e2e/ESIMD/acc_gather_scatter_rgba.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 //
 // The test checks functionality of the gather_rgba/scatter_rgba accessor-based
diff --git a/sycl/test-e2e/ESIMD/acc_gather_scatter_rgba_stateless.cpp b/sycl/test-e2e/ESIMD/acc_gather_scatter_rgba_stateless.cpp
index de12f93d51e6..02e943b742fb 100644
--- a/sycl/test-e2e/ESIMD/acc_gather_scatter_rgba_stateless.cpp
+++ b/sycl/test-e2e/ESIMD/acc_gather_scatter_rgba_stateless.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -fsycl-esimd-force-stateless-mem -o %t.out
+// RUN: %{build} -fsycl-esimd-force-stateless-mem -o %t.out
 // RUN: %{run} %t.out
 //
 // The test checks functionality of the gather_rgba/scatter_rgba accessor-based
diff --git a/sycl/test-e2e/ESIMD/accessor_gather_scatter.cpp b/sycl/test-e2e/ESIMD/accessor_gather_scatter.cpp
index 4f659291b4cc..f52b858d7f5b 100644
--- a/sycl/test-e2e/ESIMD/accessor_gather_scatter.cpp
+++ b/sycl/test-e2e/ESIMD/accessor_gather_scatter.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 //
 // The test checks functionality of the gather/scatter accessor-based ESIMD
diff --git a/sycl/test-e2e/ESIMD/accessor_gather_scatter_stateless.cpp b/sycl/test-e2e/ESIMD/accessor_gather_scatter_stateless.cpp
index bc5a35d9b26d..37bb9250c3ee 100644
--- a/sycl/test-e2e/ESIMD/accessor_gather_scatter_stateless.cpp
+++ b/sycl/test-e2e/ESIMD/accessor_gather_scatter_stateless.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -fsycl-esimd-force-stateless-mem -o %t.out
+// RUN: %{build} -fsycl-esimd-force-stateless-mem -o %t.out
 // RUN: %{run} %t.out
 //
 // The test checks functionality of the gather/scatter accessor-based ESIMD
diff --git a/sycl/test-e2e/ESIMD/accessor_stateless.cpp b/sycl/test-e2e/ESIMD/accessor_stateless.cpp
index aa3384bf0117..1c99d304fac0 100644
--- a/sycl/test-e2e/ESIMD/accessor_stateless.cpp
+++ b/sycl/test-e2e/ESIMD/accessor_stateless.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -fsycl-esimd-force-stateless-mem -D_CRT_SECURE_NO_WARNINGS=1 -o %t.out
+// RUN: %{build} -fsycl-esimd-force-stateless-mem -D_CRT_SECURE_NO_WARNINGS=1 -o %t.out
 // RUN: %{run} %t.out
 
 // This test checks that accessor-based memory accesses work correctly in ESIMD
diff --git a/sycl/test-e2e/ESIMD/api/bin_and_cmp_ops_heavy.cpp b/sycl/test-e2e/ESIMD/api/bin_and_cmp_ops_heavy.cpp
index 66b434d9f9ce..d520b1de9f9d 100644
--- a/sycl/test-e2e/ESIMD/api/bin_and_cmp_ops_heavy.cpp
+++ b/sycl/test-e2e/ESIMD/api/bin_and_cmp_ops_heavy.cpp
@@ -7,8 +7,7 @@
 //===----------------------------------------------------------------------===//
 // Exclude PVC not to run same test cases twice (via the *_pvc.cpp variant).
 // UNSUPPORTED: gpu-intel-pvc
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
 // RUN: %{run} %t.out
 
 // Tests various binary operations applied to simd objects.
diff --git a/sycl/test-e2e/ESIMD/api/esimd_pack_unpack_mask.cpp b/sycl/test-e2e/ESIMD/api/esimd_pack_unpack_mask.cpp
index dd9894b3053b..65de727ae29f 100644
--- a/sycl/test-e2e/ESIMD/api/esimd_pack_unpack_mask.cpp
+++ b/sycl/test-e2e/ESIMD/api/esimd_pack_unpack_mask.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
 // RUN: %{run} %t.out
 //
 // Smoke test for the esimd pack_mask/unpack_mask APIs.
diff --git a/sycl/test-e2e/ESIMD/api/esimd_rgba_smoke.cpp b/sycl/test-e2e/ESIMD/api/esimd_rgba_smoke.cpp
index 7b87733b4d77..2de0f2c89bb6 100644
--- a/sycl/test-e2e/ESIMD/api/esimd_rgba_smoke.cpp
+++ b/sycl/test-e2e/ESIMD/api/esimd_rgba_smoke.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 // Smoke test for scatter/gather also illustrating correct use of these APIs
diff --git a/sycl/test-e2e/ESIMD/api/esimd_rgba_smoke_64.cpp b/sycl/test-e2e/ESIMD/api/esimd_rgba_smoke_64.cpp
index 50c2f649325e..3b4283c65cc2 100644
--- a/sycl/test-e2e/ESIMD/api/esimd_rgba_smoke_64.cpp
+++ b/sycl/test-e2e/ESIMD/api/esimd_rgba_smoke_64.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 // Smoke test for scatter/gather also illustrating correct use of these APIs
diff --git a/sycl/test-e2e/ESIMD/api/functional/functions/functions_select_lvalue_fp_extra.cpp b/sycl/test-e2e/ESIMD/api/functional/functions/functions_select_lvalue_fp_extra.cpp
index bd5903107378..af39b9e5ea52 100644
--- a/sycl/test-e2e/ESIMD/api/functional/functions/functions_select_lvalue_fp_extra.cpp
+++ b/sycl/test-e2e/ESIMD/api/functional/functions/functions_select_lvalue_fp_extra.cpp
@@ -6,8 +6,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
 // RUN: %{run} %t.out
 //
 // Test for simd lvalue select function.
diff --git a/sycl/test-e2e/ESIMD/api/simd_any_all.cpp b/sycl/test-e2e/ESIMD/api/simd_any_all.cpp
index d6108643547d..9ca94f8195c7 100644
--- a/sycl/test-e2e/ESIMD/api/simd_any_all.cpp
+++ b/sycl/test-e2e/ESIMD/api/simd_any_all.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
 // RUN: %{run} %t.out
 //
 // Smoke test for esimd any/all operations APIs.
diff --git a/sycl/test-e2e/ESIMD/api/simd_copy_to_from.cpp b/sycl/test-e2e/ESIMD/api/simd_copy_to_from.cpp
index 947c7bd990fa..d17938583278 100644
--- a/sycl/test-e2e/ESIMD/api/simd_copy_to_from.cpp
+++ b/sycl/test-e2e/ESIMD/api/simd_copy_to_from.cpp
@@ -6,8 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 // UNSUPPORTED: gpu-intel-pvc
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 // This test checks simd::copy_from/to methods with alignment flags.
diff --git a/sycl/test-e2e/ESIMD/api/simd_mask.cpp b/sycl/test-e2e/ESIMD/api/simd_mask.cpp
index 7e3fd767fc3a..2fc2dd71a823 100644
--- a/sycl/test-e2e/ESIMD/api/simd_mask.cpp
+++ b/sycl/test-e2e/ESIMD/api/simd_mask.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -I%S/.. -o %t.out
+// RUN: %{build} -I%S/.. -o %t.out
 // RUN: %{run} %t.out
 
 // Smoke test for simd_mask API functionality.
diff --git a/sycl/test-e2e/ESIMD/api/simd_memory_access.cpp b/sycl/test-e2e/ESIMD/api/simd_memory_access.cpp
index a91fc6fce553..3c0b49e88ab0 100644
--- a/sycl/test-e2e/ESIMD/api/simd_memory_access.cpp
+++ b/sycl/test-e2e/ESIMD/api/simd_memory_access.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
 // RUN: %{run} %t.out
 //
 // The test checks functionality of the memory access APIs which are members of
diff --git a/sycl/test-e2e/ESIMD/api/simd_view_select_2d_fp.cpp b/sycl/test-e2e/ESIMD/api/simd_view_select_2d_fp.cpp
index 887c213f772d..e8815d61ad4a 100644
--- a/sycl/test-e2e/ESIMD/api/simd_view_select_2d_fp.cpp
+++ b/sycl/test-e2e/ESIMD/api/simd_view_select_2d_fp.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
 // RUN: %{run} %t.out
 //
 // Smoke test for 2D region select API which can be used to represent 2D tiles.
diff --git a/sycl/test-e2e/ESIMD/api/simd_view_select_2d_int.cpp b/sycl/test-e2e/ESIMD/api/simd_view_select_2d_int.cpp
index d8b9580e967f..9c0f18f0ddea 100644
--- a/sycl/test-e2e/ESIMD/api/simd_view_select_2d_int.cpp
+++ b/sycl/test-e2e/ESIMD/api/simd_view_select_2d_int.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
 // RUN: %{run} %t.out
 //
 // Smoke test for 2D region select API which can be used to represent 2D tiles.
diff --git a/sycl/test-e2e/ESIMD/api/slm_gather_scatter.cpp b/sycl/test-e2e/ESIMD/api/slm_gather_scatter.cpp
index bcf4e7ecb8db..d604fb6450e5 100644
--- a/sycl/test-e2e/ESIMD/api/slm_gather_scatter.cpp
+++ b/sycl/test-e2e/ESIMD/api/slm_gather_scatter.cpp
@@ -1,5 +1,4 @@
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
 // RUN: %{run} %t.out
 //
 // The test checks functionality of the slm_gather/slm_scatter ESIMD APIs.
diff --git a/sycl/test-e2e/ESIMD/api/svm_gather_scatter.cpp b/sycl/test-e2e/ESIMD/api/svm_gather_scatter.cpp
index 3ae31569df54..537fb7ae1d3b 100644
--- a/sycl/test-e2e/ESIMD/api/svm_gather_scatter.cpp
+++ b/sycl/test-e2e/ESIMD/api/svm_gather_scatter.cpp
@@ -6,8 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 // UNSUPPORTED: gpu-intel-pvc
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
 // RUN: %{run} %t.out
 
 // Regression test for SVM gather/scatter API.
diff --git a/sycl/test-e2e/ESIMD/api/svm_gather_scatter_64.cpp b/sycl/test-e2e/ESIMD/api/svm_gather_scatter_64.cpp
index 6ae70eba24a3..690439568d85 100644
--- a/sycl/test-e2e/ESIMD/api/svm_gather_scatter_64.cpp
+++ b/sycl/test-e2e/ESIMD/api/svm_gather_scatter_64.cpp
@@ -6,8 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 // UNSUPOORTED: gpu-intel-pvc
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 // Regression test for gather/scatter API.
diff --git a/sycl/test-e2e/ESIMD/api/unary_ops_heavy.cpp b/sycl/test-e2e/ESIMD/api/unary_ops_heavy.cpp
index f360630478e8..b32c726bcf08 100644
--- a/sycl/test-e2e/ESIMD/api/unary_ops_heavy.cpp
+++ b/sycl/test-e2e/ESIMD/api/unary_ops_heavy.cpp
@@ -7,8 +7,7 @@
 //===----------------------------------------------------------------------===//
 // Exclude PVC not to run same test cases twice (via the *_pvc.cpp variant).
 // UNSUPPORTED: gpu-intel-pvc
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -fsycl-device-code-split=per_kernel -o %t.out
+// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
 // RUN: %{run} %t.out
 
 // Tests various unary operations applied to simd objects.
diff --git a/sycl/test-e2e/ESIMD/histogram.cpp b/sycl/test-e2e/ESIMD/histogram.cpp
index 555ea8d3c73f..6ee1cc5e0b0d 100644
--- a/sycl/test-e2e/ESIMD/histogram.cpp
+++ b/sycl/test-e2e/ESIMD/histogram.cpp
@@ -6,8 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 // REQUIRES: aspect-ext_intel_legacy_image
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include "esimd_test_utils.hpp"
diff --git a/sycl/test-e2e/ESIMD/histogram_256_slm.cpp b/sycl/test-e2e/ESIMD/histogram_256_slm.cpp
index 9c2a7d7a0237..2a7301702835 100644
--- a/sycl/test-e2e/ESIMD/histogram_256_slm.cpp
+++ b/sycl/test-e2e/ESIMD/histogram_256_slm.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include "esimd_test_utils.hpp"
diff --git a/sycl/test-e2e/ESIMD/histogram_256_slm_spec_2020.cpp b/sycl/test-e2e/ESIMD/histogram_256_slm_spec_2020.cpp
index 4252adca8ab3..769d37632700 100644
--- a/sycl/test-e2e/ESIMD/histogram_256_slm_spec_2020.cpp
+++ b/sycl/test-e2e/ESIMD/histogram_256_slm_spec_2020.cpp
@@ -1,7 +1,6 @@
 // TODO enable on Windows
 // REQUIRES: linux
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out 16
 
 #include "esimd_test_utils.hpp"
diff --git a/sycl/test-e2e/ESIMD/histogram_2d.cpp b/sycl/test-e2e/ESIMD/histogram_2d.cpp
index 73001218f19a..1e1e25086aaa 100644
--- a/sycl/test-e2e/ESIMD/histogram_2d.cpp
+++ b/sycl/test-e2e/ESIMD/histogram_2d.cpp
@@ -6,8 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 // REQUIRES: aspect-ext_intel_legacy_image
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include "esimd_test_utils.hpp"
diff --git a/sycl/test-e2e/ESIMD/histogram_2d_64.cpp b/sycl/test-e2e/ESIMD/histogram_2d_64.cpp
index 1931e9df361f..0da0206539b0 100644
--- a/sycl/test-e2e/ESIMD/histogram_2d_64.cpp
+++ b/sycl/test-e2e/ESIMD/histogram_2d_64.cpp
@@ -6,8 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 // REQUIRES: aspect-ext_intel_legacy_image
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 //
 // 64 bit offset variant of the test - uses 64 bit offsets.
diff --git a/sycl/test-e2e/ESIMD/histogram_64.cpp b/sycl/test-e2e/ESIMD/histogram_64.cpp
index 1030d177529f..928c9de45fea 100644
--- a/sycl/test-e2e/ESIMD/histogram_64.cpp
+++ b/sycl/test-e2e/ESIMD/histogram_64.cpp
@@ -6,8 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 // REQUIRES: aspect-ext_intel_legacy_image
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 //
 // 64 bit offset variant of the test - uses 64 bit offsets.
diff --git a/sycl/test-e2e/ESIMD/imulh_umulh.cpp b/sycl/test-e2e/ESIMD/imulh_umulh.cpp
index 61973269067a..1d40e466fed5 100644
--- a/sycl/test-e2e/ESIMD/imulh_umulh.cpp
+++ b/sycl/test-e2e/ESIMD/imulh_umulh.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 // The test verifies ESIMD API that multiplies 2 32-bit integer scalars/vectors
diff --git a/sycl/test-e2e/ESIMD/kmeans/kmeans.cpp b/sycl/test-e2e/ESIMD/kmeans/kmeans.cpp
index 50328431ea0c..53e2e5df5f6c 100644
--- a/sycl/test-e2e/ESIMD/kmeans/kmeans.cpp
+++ b/sycl/test-e2e/ESIMD/kmeans/kmeans.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -I%S/.. -o %t.out
+// RUN: %{build} -I%S/.. -o %t.out
 // RUN: %{run} %t.out %S/points.csv
 
 #include "kmeans.h"
diff --git a/sycl/test-e2e/ESIMD/linear/linear.cpp b/sycl/test-e2e/ESIMD/linear/linear.cpp
index 039828e0e729..00a5ad4063bb 100644
--- a/sycl/test-e2e/ESIMD/linear/linear.cpp
+++ b/sycl/test-e2e/ESIMD/linear/linear.cpp
@@ -6,8 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 // REQUIRES: aspect-ext_intel_legacy_image
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -I%S/.. -o %t.out
+// RUN: %{build} -I%S/.. -o %t.out
 // RUN: %{run} %t.out %S/linear_in.bmp %S/linear_gold_hw.bmp
 
 #include "bitmap_helpers.h"
diff --git a/sycl/test-e2e/ESIMD/matrix_transpose_glb.cpp b/sycl/test-e2e/ESIMD/matrix_transpose_glb.cpp
index 95823841cc2e..f1fc98b08f8f 100644
--- a/sycl/test-e2e/ESIMD/matrix_transpose_glb.cpp
+++ b/sycl/test-e2e/ESIMD/matrix_transpose_glb.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include "esimd_test_utils.hpp"
diff --git a/sycl/test-e2e/ESIMD/matrix_transpose_usm.cpp b/sycl/test-e2e/ESIMD/matrix_transpose_usm.cpp
index 1d5e9731dab8..eacee17c72ca 100644
--- a/sycl/test-e2e/ESIMD/matrix_transpose_usm.cpp
+++ b/sycl/test-e2e/ESIMD/matrix_transpose_usm.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include "esimd_test_utils.hpp"
diff --git a/sycl/test-e2e/ESIMD/radix_sort.cpp b/sycl/test-e2e/ESIMD/radix_sort.cpp
index 67d6ac5114de..01a18911f911 100644
--- a/sycl/test-e2e/ESIMD/radix_sort.cpp
+++ b/sycl/test-e2e/ESIMD/radix_sort.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 // This test implements parallel radix sort on GPU
diff --git a/sycl/test-e2e/ESIMD/reduction.cpp b/sycl/test-e2e/ESIMD/reduction.cpp
index c18f821df1ec..f707e37d6cba 100644
--- a/sycl/test-e2e/ESIMD/reduction.cpp
+++ b/sycl/test-e2e/ESIMD/reduction.cpp
@@ -6,8 +6,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include "esimd_test_utils.hpp"
diff --git a/sycl/test-e2e/ESIMD/regression/bit_shift_compilation_test.cpp b/sycl/test-e2e/ESIMD/regression/bit_shift_compilation_test.cpp
index 84c5f3d306fc..74f22322c99b 100644
--- a/sycl/test-e2e/ESIMD/regression/bit_shift_compilation_test.cpp
+++ b/sycl/test-e2e/ESIMD/regression/bit_shift_compilation_test.cpp
@@ -1,5 +1,4 @@
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 //==- bit_shift_compilation_test.cpp - Test for compilation of bit shift
 // functions -==//
diff --git a/sycl/test-e2e/ESIMD/regression/copyto_char_test.cpp b/sycl/test-e2e/ESIMD/regression/copyto_char_test.cpp
index 4e163d0f1f3f..59f61a46e83b 100644
--- a/sycl/test-e2e/ESIMD/regression/copyto_char_test.cpp
+++ b/sycl/test-e2e/ESIMD/regression/copyto_char_test.cpp
@@ -1,4 +1,4 @@
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 // UNSUPPORTED: opencl && gpu-intel-pvc
diff --git a/sycl/test-e2e/ESIMD/regression/tanh_fix_test.cpp b/sycl/test-e2e/ESIMD/regression/tanh_fix_test.cpp
index afa47c84f1ea..6034699c0c1b 100644
--- a/sycl/test-e2e/ESIMD/regression/tanh_fix_test.cpp
+++ b/sycl/test-e2e/ESIMD/regression/tanh_fix_test.cpp
@@ -1,5 +1,4 @@
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 //==- tanh_fix_test.cpp - Test for tanh -==//
diff --git a/sycl/test-e2e/ESIMD/regression/usm_gather_scatter_32.cpp b/sycl/test-e2e/ESIMD/regression/usm_gather_scatter_32.cpp
index 82e386e904e3..6d181cac8758 100644
--- a/sycl/test-e2e/ESIMD/regression/usm_gather_scatter_32.cpp
+++ b/sycl/test-e2e/ESIMD/regression/usm_gather_scatter_32.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -I%S/.. -o %t.out
+// RUN: %{build} -I%S/.. -o %t.out
 // RUN: %{run} %t.out
 
 // Regression test for checking USM-based gather/scatter with 32 elements.
diff --git a/sycl/test-e2e/ESIMD/slm_barrier.cpp b/sycl/test-e2e/ESIMD/slm_barrier.cpp
index 76e2a4aac0d6..7fb9567ea64b 100644
--- a/sycl/test-e2e/ESIMD/slm_barrier.cpp
+++ b/sycl/test-e2e/ESIMD/slm_barrier.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include "esimd_test_utils.hpp"
diff --git a/sycl/test-e2e/ESIMD/slm_split_barrier.cpp b/sycl/test-e2e/ESIMD/slm_split_barrier.cpp
index b40bfb630efa..ddffe17b2d53 100644
--- a/sycl/test-e2e/ESIMD/slm_split_barrier.cpp
+++ b/sycl/test-e2e/ESIMD/slm_split_barrier.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include "esimd_test_utils.hpp"
diff --git a/sycl/test-e2e/ESIMD/usm_gather_scatter_rgba.cpp b/sycl/test-e2e/ESIMD/usm_gather_scatter_rgba.cpp
index 586a75d2cae8..962d744f9112 100644
--- a/sycl/test-e2e/ESIMD/usm_gather_scatter_rgba.cpp
+++ b/sycl/test-e2e/ESIMD/usm_gather_scatter_rgba.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 //
 // The test checks functionality of the gather_rgba/scatter_rgba USM-based ESIMD
diff --git a/sycl/test-e2e/ESIMD/usm_gather_scatter_rgba_64.cpp b/sycl/test-e2e/ESIMD/usm_gather_scatter_rgba_64.cpp
index 04879cff6588..4b0bbcf6baad 100644
--- a/sycl/test-e2e/ESIMD/usm_gather_scatter_rgba_64.cpp
+++ b/sycl/test-e2e/ESIMD/usm_gather_scatter_rgba_64.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 //
 // The test checks functionality of the gather_rgba/scatter_rgba USM-based ESIMD
diff --git a/sycl/test-e2e/ESIMD/vadd_usm.cpp b/sycl/test-e2e/ESIMD/vadd_usm.cpp
index 180db61974fd..c34c7b068046 100644
--- a/sycl/test-e2e/ESIMD/vadd_usm.cpp
+++ b/sycl/test-e2e/ESIMD/vadd_usm.cpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// Use -O2 to avoid huge stack usage under -O0.
-// RUN: %{build} -O2 -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
 #include "esimd_test_utils.hpp"