From 1fa97fbb35a76a4b4bc1fc1c701feb2d8ab188ad Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Thu, 23 Oct 2025 13:59:54 -0700 Subject: [PATCH 1/6] pick up ALL the lib files to get dynamic_compress working --- sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp b/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp index 59b96af74322b..e17aeee32ca58 100644 --- a/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp +++ b/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp @@ -31,7 +31,7 @@ // RUN: -fsycl-allow-device-image-dependencies -fsycl-device-code-split=per_kernel \ // RUN: %S/Inputs/basic.cpp -o %t.out \ // RUN: %if windows \ -// RUN: %{%t.dir/libdevicecompress_a.lib%} \ +// RUN: %{%t.dir/libdevicecompress_a.lib%} %{%t.dir/libdevicecompress_b.lib%} %{%t.dir/libdevicecompress_c.lib%} %{%t.dir/libdevicecompress_d.lib%} \ // RUN: %else \ // RUN: %{-L%t.dir -ldevicecompress_a -ldevicecompress_b -ldevicecompress_c -ldevicecompress_d -Wl,-rpath=%t.dir%} From 1d7656b1f2aa8f058802a3c2f7dd92f8f58101c4 Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Thu, 23 Oct 2025 15:43:13 -0700 Subject: [PATCH 2/6] doh --- sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp b/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp index e17aeee32ca58..567543968a42d 100644 --- a/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp +++ b/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp @@ -31,7 +31,7 @@ // RUN: -fsycl-allow-device-image-dependencies -fsycl-device-code-split=per_kernel \ // RUN: %S/Inputs/basic.cpp -o %t.out \ // RUN: %if windows \ -// RUN: %{%t.dir/libdevicecompress_a.lib%} %{%t.dir/libdevicecompress_b.lib%} %{%t.dir/libdevicecompress_c.lib%} %{%t.dir/libdevicecompress_d.lib%} \ +// RUN: %{%t.dir/libdevicecompress_a.lib %t.dir/libdevicecompress_b.lib %t.dir/libdevicecompress_c.lib %t.dir/libdevicecompress_d.lib%} \ // RUN: %else \ // RUN: %{-L%t.dir -ldevicecompress_a -ldevicecompress_b -ldevicecompress_c -ldevicecompress_d -Wl,-rpath=%t.dir%} From 12a604daa9c1bf8a1a126a5d21d06ed796a39a59 Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Thu, 23 Oct 2025 15:44:14 -0700 Subject: [PATCH 3/6] re-re-move --- sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp b/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp index 567543968a42d..735caf4c69549 100644 --- a/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp +++ b/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp @@ -3,7 +3,7 @@ // REQUIRES: zstd -// XFAIL: (windows && run-mode) || target-native_cpu +// XFAIL: target-native_cpu // XFAIL-TRACKER: https://github.com/intel/llvm/issues/20397 // DEFINE: %{dynamic_lib_options} = -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs %if windows %{-DMAKE_DLL %} From 8545e1b9b7f60f4b220ac9b2b4676fa64d45490f Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Fri, 24 Oct 2025 11:00:26 -0700 Subject: [PATCH 4/6] I don't know of an -rpath equiv for windows, so this should get the runtime to inclue %t.dir on Win --- sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp b/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp index 735caf4c69549..2011748a05763 100644 --- a/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp +++ b/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp @@ -35,4 +35,4 @@ // RUN: %else \ // RUN: %{-L%t.dir -ldevicecompress_a -ldevicecompress_b -ldevicecompress_c -ldevicecompress_d -Wl,-rpath=%t.dir%} -// RUN: %{run} %t.out +// RUN: %if windows %{env PATH=%t.dir;%PATH% %{run} %t.out%} %else %{run} %t.out% From 7907f7e97d40250b61bdde0fb4b4908209cbe2e9 Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Fri, 24 Oct 2025 12:00:03 -0700 Subject: [PATCH 5/6] protest commit Signed-off-by: Chris Perkins --- sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp b/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp index 2011748a05763..ee42a46925d8b 100644 --- a/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp +++ b/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp @@ -35,4 +35,4 @@ // RUN: %else \ // RUN: %{-L%t.dir -ldevicecompress_a -ldevicecompress_b -ldevicecompress_c -ldevicecompress_d -Wl,-rpath=%t.dir%} -// RUN: %if windows %{env PATH=%t.dir;%PATH% %{run} %t.out%} %else %{run} %t.out% +// RUN: %if windows %{env PATH=%t.dir;%PATH% %{run} %t.out%} %else %{ %{run} %t.out %} From 7d194a2d3f2340aa4f40d0f6de571626d1022a9e Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Fri, 24 Oct 2025 13:01:02 -0700 Subject: [PATCH 6/6] winning --- sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp b/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp index ee42a46925d8b..99b2baf272d5b 100644 --- a/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp +++ b/sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp @@ -35,4 +35,4 @@ // RUN: %else \ // RUN: %{-L%t.dir -ldevicecompress_a -ldevicecompress_b -ldevicecompress_c -ldevicecompress_d -Wl,-rpath=%t.dir%} -// RUN: %if windows %{env PATH=%t.dir;%PATH% %{run} %t.out%} %else %{ %{run} %t.out %} +// RUN: %if windows %{ cmd /c "set PATH=%t.dir;%PATH% && %{run} %t.out" %} %else %{ %{run} %t.out %}