[SYCL][E2E] Fix preview flag testing for non-HIP and non-CUDA devices (#11978)

The preview flag testing for E2E testing is currently broken.
#11929 attempts to fix it but has
shown that some breakages in CUDA and HIP have been hidden behind the
broken testing. To allow for proper testing while these failures are
being investigated, this PR implements the fixes from
#11929 with the caveat that they do
not apply when HIP and CUDA devices are part of the testing. This is a
temporary solution and does *not* replace
#11929.

---------

Signed-off-by: Larsen, Steffen <[email protected]>
Co-authored-by: Chris Perkins <[email protected]>

Author: steffenlarsen

sycl/test-e2e/Basic/vector/int-convert.cpp

@@ -10,8 +10,8 @@
 // RUN: %{build} -o %t.out -DSYCL2020_DISABLE_DEPRECATION_WARNINGS
 // RUN: %{run} %t.out
 //
-// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -DSYCL2020_DISABLE_DEPRECATION_WARNINGS %s -o %t2.out %}
-// RUN: %if preview-breaking-changes-supported %{  %{run} %t2.out %}
+// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes -DSYCL2020_DISABLE_DEPRECATION_WARNINGS %s -o %t2.out %}
+// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
 
 #include <sycl/sycl.hpp>
 

sycl/test-e2e/DeviceLib/built-ins/scalar_integer.cpp

@@ -1,7 +1,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
+// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %s -o %t2.out %}
 // RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
 
 #include <sycl/sycl.hpp>

sycl/test-e2e/PreviewBreakingChanges/preview_lib_marker.cpp

@@ -1,6 +1,6 @@
 // REQUIRES: preview-breaking-changes-supported
 
-// RUN: %clangxx -fsycl -fpreview-breaking-changes %s -o %t
+// RUN: %clangxx -fsycl -fpreview-breaking-changes %s -o %t.out
 // RUN: %{run} %t.out
 
 // Test to help identify that E2E testing correctly detects and uses the preview

sycl/test-e2e/Regression/vec_logical_ops.cpp

@@ -1,6 +1,8 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
-// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes && ./%t.out %}
+
+// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %s -o %t2.out %}
+// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
 
 #include <sycl/sycl.hpp>
 

sycl/test-e2e/USM/math.cpp

@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
+// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %s -o %t2.out %}
 // RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
 
 #include <sycl/sycl.hpp>

sycl/test-e2e/format.py

@@ -181,6 +181,13 @@ def get_extra_env(sycl_devices):
 
         substitutions.append(('%{run-unfiltered-devices}', run_unfiltered_substitution))
 
+
+        # Temporary fix due to failures in CUDA and HIP behind preview flag.
+        if ((('ext_oneapi_cuda:gpu' in devices_for_test) or
+            ('ext_oneapi_hip:gpu' in devices_for_test)) and
+            ('preview-breaking-changes-supported' in test.config.available_features)):
+            test.config.available_features.remove('preview-breaking-changes-supported')
+
         new_script = []
         for directive in script:
             if not isinstance(directive, lit.TestRunner.CommandDirective):
@@ -203,9 +210,9 @@ def get_extra_env(sycl_devices):
                 # Expand device-specific condtions (%if ... %{ ... %}).
                 tmp_script = [ cmd ]
                 conditions = {x: True for x in sycl_device.split(':')}
-                for op_sys in ['linux', 'windows']:
-                    if op_sys in test.config.available_features:
-                        conditions[op_sys] = True
+                for cond_features in ['linux', 'windows', 'preview-breaking-changes-supported']:
+                    if cond_features in test.config.available_features:
+                        conditions[cond_features] = True
 
                 tmp_script = lit.TestRunner.applySubstitutions(
                     tmp_script, [], conditions, recursion_limit=test.config.recursiveExpansionLimit)

sycl/test-e2e/lit.cfg.py

@@ -177,11 +177,11 @@
 # Check for sycl-preview library
 check_preview_breaking_changes_file='preview_breaking_changes_link.cpp'
 with open(check_preview_breaking_changes_file, 'w') as fp:
-    fp.write('#include <sycl/sycl.hpp>')
-    fp.write('namespace sycl { inline namespace _V1 { namespace detail {')
-    fp.write('extern void PreviewMajorReleaseMarker();')
-    fp.write('}}}')
-    fp.write('int main() { sycl::detail::PreviewMajorReleaseMarker(); return 0; }')
+    fp.write('#include <sycl/sycl.hpp>\n')
+    fp.write('namespace sycl { inline namespace _V1 { namespace detail {\n')
+    fp.write('extern void PreviewMajorReleaseMarker();\n')
+    fp.write('}}}\n')
+    fp.write('int main() { sycl::detail::PreviewMajorReleaseMarker(); return 0; }\n')
 
 sp = subprocess.getstatusoutput(config.dpcpp_compiler+' -fsycl -fpreview-breaking-changes ' + check_preview_breaking_changes_file)
 if sp[0] == 0: