Skip to content

Commit d03db3f

Browse files
[SYCL][sycl-rel] Stabilize 6.1 nightly (#17799)
This is a joined cherry-pick of #17367, #17362 and #17746 intended to fix a few remaining issues we see in 6.1 nightly validation run. Descriptions of cherry-picked commits: --- [SYCL] Disable launch_policy_neg.cpp on Windows (#17367) Fails to compile on new MSVC. Patch-by: Sarnie, Nick <nick.sarnie@intel.com> --- [SYCL] Avoid testing race condition Use no output file instead of default output file in LIT tests. This occasionally caused errors on windows when multiple files compile to the same output file. Using `-fsyntax-only` hjere also avoids running the full compiler pipeline See #7872 for more context Patch-By: David Garcia Orozco <david.garcia.orozco@intel.com> --- [SYCL] Fix clang-linker-wrapper Windows test (#17746) Failing now because I recently added `ptxas` to the path on these runners. Patch-by: Sarnie, Nick <nick.sarnie@intel.com> ---
1 parent d92787a commit d03db3f

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

clang/test/Driver/linker-wrapper-sycl-win.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
// CHK-CMDS-AOT-NV-NEXT: "{{.*}}llvm-link.exe" -only-needed [[FIRSTLLVMLINKOUT]].bc {{.*}}.bc -o [[SECONDLLVMLINKOUT:.*]].bc --suppress-warnings
9191
// CHK-CMDS-AOT-NV-NEXT: "{{.*}}sycl-post-link.exe"{{.*}} SYCL_POST_LINK_OPTIONS -o [[SYCLPOSTLINKOUT:.*]].table [[SECONDLLVMLINKOUT]].bc
9292
// CHK-CMDS-AOT-NV-NEXT: "{{.*}}clang.exe"{{.*}} -o [[CLANGOUT:.*]] --target=nvptx64-nvidia-cuda -march={{.*}}
93-
// CHK-CMDS-AOT-NV-NEXT: "{{.*}}ptxas"{{.*}} --output-file [[PTXASOUT:.*]] [[CLANGOUT]]
94-
// CHK-CMDS-AOT-NV-NEXT: "{{.*}}fatbinary"{{.*}} --create [[FATBINOUT:.*]] --image=profile={{.*}},file=[[CLANGOUT]] --image=profile={{.*}},file=[[PTXASOUT]]
93+
// CHK-CMDS-AOT-NV-NEXT: "{{.*}}ptxas{{.*}} --output-file [[PTXASOUT:.*]] [[CLANGOUT]]
94+
// CHK-CMDS-AOT-NV-NEXT: "{{.*}}fatbinary{{.*}} --create [[FATBINOUT:.*]] --image=profile={{.*}},file=[[CLANGOUT]] --image=profile={{.*}},file=[[PTXASOUT]]
9595
// CHK-CMDS-AOT-NV-NEXT: offload-wrapper: input: [[FATBINOUT]], output: [[WRAPPEROUT:.*]].bc
9696
// CHK-CMDS-AOT-NV-NEXT: "{{.*}}clang.exe"{{.*}} -c -o [[LLCOUT:.*]].o [[WRAPPEROUT]].bc
9797
// CHK-CMDS-AOT-NV-NEXT: "{{.*}}ld" -- HOST_LINKER_FLAGS -dynamic-linker HOST_DYN_LIB -o a.out [[LLCOUT]].o HOST_LIB_PATH HOST_STAT_LIB {{.*}}.o

sycl/test/basic_tests/header_footer_diagnostics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -fsycl -Werror=reserved-identifier -Werror=old-style-cast %s
1+
// RUN: %clangxx -fsycl -Werror=reserved-identifier -Werror=old-style-cast %s -fsyntax-only
22

33
// Check that the generated header and footer files do not generate
44
// errors when pedantic warnings are enabled.

sycl/test/basic_tests/is_group_trait.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -fsycl %s
1+
// RUN: %clangxx -fsycl %s -fsyntax-only
22

33
#include <sycl/sycl.hpp>
44

sycl/test/esimd/slm_init_local_accessor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -fsycl %s
1+
// RUN: %clangxx -fsycl %s -fsyntax-only
22

33
// This test verifies usage of slm_init and local_accessor in different kernels
44
// passes.

sycl/test/syclcompat/launch/launch_policy_neg.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
* Description:
2020
* Negative tests for new launch_policy.
2121
**************************************************************************/
22-
22+
// UNSUPPORTED: windows
23+
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17116
2324
// RUN: not %clangxx -fsycl -fsyntax-only %s -DCHECK1 2>&1 | FileCheck -vv %s --check-prefixes=CHECK1
2425
// RUN: not %clangxx -fsycl -fsyntax-only %s -DCHECK2 2>&1 | FileCheck -vv %s --check-prefixes=CHECK2
2526
// RUN: not %clangxx -fsycl -fsyntax-only %s -DCHECK3 2>&1 | FileCheck -vv %s --check-prefixes=CHECK3

0 commit comments

Comments
 (0)