diff --git a/sycl/test-e2e/E2EExpr.py b/sycl/test-e2e/E2EExpr.py index db929d3f08a7a..a34df43f76ee6 100644 --- a/sycl/test-e2e/E2EExpr.py +++ b/sycl/test-e2e/E2EExpr.py @@ -34,6 +34,8 @@ class E2EExpr(BooleanExpression): "hip_dev_kit", "zstd", "vulkan", + "hip_options", + "cuda_options", "true", "false", } diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 5c8f5f7732e30..a422c92639fe0 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -434,7 +434,7 @@ def open_check_file(file_name): ) ) -cuda_options = cuda_options = ( +cuda_options = ( (" -L" + config.cuda_libs_dir if config.cuda_libs_dir else "") + " -lcuda " + " -I" @@ -447,6 +447,10 @@ def open_check_file(file_name): + " /I" + config.cuda_include ) +if platform.system() == "Windows": + cuda_options += ( + " --cuda-path=" + os.path.dirname(os.path.dirname(config.cuda_libs_dir)) + f'"' + ) config.substitutions.append(("%cuda_options", cuda_options)) @@ -483,7 +487,7 @@ def open_check_file(file_name): ) ) -hip_options = hip_options = ( +hip_options = ( (" -L" + config.hip_libs_dir if config.hip_libs_dir else "") + " -lamdhip64 " + " -I" @@ -500,7 +504,8 @@ def open_check_file(file_name): + " /I" + config.hip_include ) - +if platform.system() == "Windows": + hip_options += " --rocm-path=" + os.path.dirname(config.hip_libs_dir) + f'"' with test_env(): sp = subprocess.getstatusoutput( config.dpcpp_compiler + " -fsycl " + check_hip_file + hip_options