test

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

Diff for: clang/lib/Sema/SemaDeclAttr.cpp

@@ -5574,7 +5574,7 @@ bool Sema::CheckCallingConvAttr(const ParsedAttr &Attrs, CallingConv &CC,
       A = HostTI->checkCallingConvention(CC);
     if (A == TargetInfo::CCCR_OK && CheckDevice && DeviceTI)
       A = DeviceTI->checkCallingConvention(CC);
-  } else if (LangOpts.SYCLIsDevice && Aux->getTriple().isOSWindows() &&
+  } else if (LangOpts.SYCLIsDevice && (Aux && Aux->getTriple().isOSWindows()) &&
              TI.getTriple().isAMDGPU() &&
              getSourceManager().isInSystemHeader(Attrs.getScopeLoc())) {
     A = TI.checkCallingConvention(CC);

Diff for: sycl/test-e2e/E2EExpr.py

@@ -33,6 +33,8 @@ class E2EExpr(BooleanExpression):
         "hip_dev_kit",
         "zstd",
         "vulkan",
+        "hip_options"
+        "cuda_options"
         "true",
         "false",
     }

Diff for: sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_amdgcn.cpp

@@ -1,5 +1,5 @@
 // REQUIRES: hip_dev_kit
 
-// RUN: %clangxx -fsycl -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=gfx1030 --rocm-path="C:/Program Files/AMD/ROCm/6.2/" %S/Inputs/is_compatible_with_env.cpp -o %t.out
+// RUN: %clangxx %hip_options -fsycl -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=gfx1030 %S/Inputs/is_compatible_with_env.cpp -o %t.out
 
 // RUN: %if !hip %{ not %} %{run} %t.out

Diff for: sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_nvptx64.cpp

@@ -1,9 +1,5 @@
 // REQUIRES: cuda_dev_kit
 
-// UNSUPPORTED: windows
-// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17515
-// CUDA libs are not installed correctly.
-
-// RUN: %clangxx -fsycl -fsycl-targets=nvptx64-nvidia-cuda %S/Inputs/is_compatible_with_env.cpp -o %t.out
+// RUN: %clangxx %cuda_options -fsycl -fsycl-targets=nvptx64-nvidia-cuda %S/Inputs/is_compatible_with_env.cpp -o %t.out
 
 // RUN: %if !cuda %{ not %} %{run} %t.out

Diff for: sycl/test-e2e/lit.cfg.py

@@ -437,13 +437,17 @@ def open_check_file(file_name):
     + " -lcuda "
     + " -I"
     + config.cuda_include
+    + " --cuda-path="
+    + os.path.dirname(config.cuda_libs_dir)
 )
 if cl_options:
     cuda_options = (
         " "
         + (config.cuda_libs_dir + "/cuda.lib " if config.cuda_libs_dir else "cuda.lib")
         + " /I"
         + config.cuda_include
+        + " --cuda-path="
+        + os.path.dirname(config.cuda_libs_dir)
     )
 
 config.substitutions.append(("%cuda_options", cuda_options))
@@ -486,6 +490,8 @@ def open_check_file(file_name):
     + " -lamdhip64 "
     + " -I"
     + config.hip_include
+    + " --rocm-path=" +
+    os.path.dirname(config.hip_libs_dir)
 )
 if cl_options:
     hip_options = (
@@ -497,6 +503,8 @@ def open_check_file(file_name):
         )
         + " /I"
         + config.hip_include
+        + " --rocm-path=" +
+        os.path.dirname(config.hip_libs_dir)
     )
 
 with test_env():