Skip to content

Commit 88b27f3

Browse files
zhaomaosuzhaomaosu
committed
Merge branch 'sycl' into tsan-cleanup-private-shadow
2 parents 5c2bb74 + 16a14c9 commit 88b27f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+386
-110
lines changed

‎.github/workflows/sycl-detect-changes.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,18 @@ jobs:
1717
outputs:
1818
filters: ${{ steps.result.outputs.result }}
1919
steps:
20+
- name: Set changed_files
21+
id: changed_files
22+
uses: actions/github-script@v7
23+
with:
24+
script: |
25+
console.log("Number of files changed:");
26+
console.log(context.payload.pull_request.changed_files);
27+
return context.payload.pull_request.changed_files ;
28+
2029
- name: Check file changes
2130
uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
31+
if: ${{ steps.changed_files.outputs.changed_files }} < 500
2232
id: changes
2333
with:
2434
filters: |
@@ -81,8 +91,6 @@ jobs:
8191
uses: actions/github-script@v7
8292
with:
8393
script: |
84-
console.log("Number of files changed:");
85-
console.log(context.payload.pull_request.changed_files);
8694
if (context.payload.pull_request.changed_files < 500) {
8795
return '${{ steps.changes.outputs.changes }}';
8896
}

‎.github/workflows/sycl-linux-run-tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ jobs:
281281
- name: Run E2E Tests
282282
if: inputs.tests_selector == 'e2e'
283283
uses: ./devops/actions/run-tests/e2e
284+
timeout-minutes: 60
284285
with:
285286
ref: ${{ inputs.tests_ref || inputs.repo_ref || github.sha }}
286287
binaries_artifact: ${{ inputs.e2e_binaries_artifact }}

‎.github/workflows/sycl-nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
# prefer widespread gzip compression.
2424
artifact_archive_name: sycl_linux.tar.gz
2525

26-
ubuntu2204_shared_build:
26+
linux_shared_build:
2727
if: github.repository == 'intel/llvm'
2828
uses: ./.github/workflows/sycl-linux-build.yml
2929
secrets: inherit

‎.github/workflows/sycl-rel-nightly.yml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ name: SYCL Release Branch Nightly
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
testing_branch:
7+
description: |
8+
Branch to test, e.g. sycl-rel-6_0_0.
9+
If nothing is specified, the last release branch is used.
10+
511
schedule:
612
- cron: '0 3 * * *'
713

@@ -20,7 +26,7 @@ jobs:
2026
steps:
2127
- uses: actions/checkout@v4
2228
with:
23-
ref: sycl-rel-6_1_0
29+
ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0' }}
2430
- run: git show --quiet | tee -a $GITHUB_STEP_SUMMARY
2531

2632
- id: is_new_commit
@@ -40,7 +46,7 @@ jobs:
4046
build_artifact_suffix: default
4147
build_configure_extra_args: '--hip --cuda'
4248
build_image: ghcr.io/intel/llvm/ubuntu2204_build:latest
43-
build_ref: sycl-rel-6_1_0
49+
build_ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0' }}
4450

4551
# We upload the build for people to download/use, override its name and
4652
# prefer widespread gzip compression.
@@ -86,7 +92,7 @@ jobs:
8692
target_devices: ${{ matrix.target_devices }}
8793
tests_selector: ${{ matrix.tests_selector }}
8894
extra_lit_opts: ${{ matrix.extra_lit_opts }}
89-
repo_ref: sycl-rel-6_1_0
95+
repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0' }}
9096
devops_ref: sycl
9197
sycl_toolchain_artifact: sycl_linux_default
9298
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
@@ -97,7 +103,7 @@ jobs:
97103
if: ${{ github.repository == 'intel/llvm' && needs.check_for_new_commits.outputs.is_new_commit != 'false' }}
98104
uses: ./.github/workflows/sycl-windows-build.yml
99105
with:
100-
ref: sycl-rel-6_1_0
106+
ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0' }}
101107

102108
# We upload both Linux/Windows build via Github's "Releases"
103109
# functionality, make sure Linux/Windows names follow the same pattern.
@@ -116,7 +122,7 @@ jobs:
116122
runner: '["Windows","gen12"]'
117123
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
118124
extra_lit_opts: --param gpu-intel-gen12=True
119-
repo_ref: sycl-rel-6_1_0
125+
repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0' }}
120126
devops_ref: sycl
121127

122128
cuda-aws-start:
@@ -126,7 +132,7 @@ jobs:
126132
secrets: inherit
127133
with:
128134
mode: start
129-
ref: sycl-rel-6_1_0
135+
ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0' }}
130136

131137
cuda-run-tests:
132138
needs: [ubuntu2204_build, cuda-aws-start]
@@ -138,7 +144,7 @@ jobs:
138144
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
139145
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
140146
target_devices: cuda:gpu
141-
repo_ref: sycl-rel-6_1_0
147+
repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0' }}
142148
devops_ref: sycl
143149

144150
sycl_toolchain_artifact: sycl_linux_default
@@ -152,7 +158,7 @@ jobs:
152158
secrets: inherit
153159
with:
154160
mode: stop
155-
ref: sycl-rel-6_1_0
161+
ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0' }}
156162

157163
build-sycl-cts:
158164
needs: ubuntu2204_build
@@ -164,7 +170,7 @@ jobs:
164170
cts_testing_mode: 'build-only'
165171
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
166172
tests_selector: cts
167-
repo_ref: sycl-rel-6_1_0
173+
repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0' }}
168174
devops_ref: sycl
169175
tests_ref: ead7474b9cb2189ce48025550912ccad5a72bd30
170176
sycl_toolchain_artifact: sycl_linux_default

‎.github/workflows/sycl-windows-run-tests.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,13 @@ jobs:
150150
- name: Run End-to-End tests
151151
if: inputs.tests_selector == 'e2e'
152152
shell: bash {0}
153+
env:
154+
LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests --param print_features=True ${{ inputs.extra_lit_opts }}
153155
run: |
154156
# Run E2E tests.
155157
if [[ ${{inputs.compiler}} == 'icx' ]]; then
156158
export LIT_FILTER_OUT="compile_on_win_with_mdd"
157159
fi
158-
export LIT_OPTS="-v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests ${{ inputs.extra_lit_opts }}"
159160
cmake --build build-e2e --target check-sycl-e2e > e2e.log 2>&1
160161
161162
exit_code=$?

‎clang/lib/CodeGen/CodeGenModule.cpp‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2592,40 +2592,39 @@ void CodeGenModule::GenKernelArgMetadata(llvm::Function *Fn,
25922592
}
25932593
}
25942594

2595-
bool IsEsimdFunction = FD && FD->hasAttr<SYCLSimdAttr>();
2596-
2597-
if (LangOpts.SYCLIsDevice && !IsEsimdFunction) {
2598-
Fn->setMetadata("kernel_arg_buffer_location",
2599-
llvm::MDNode::get(VMContext, argSYCLBufferLocationAttr));
2600-
// Generate this metadata only if atleast one kernel argument is an
2601-
// accessor.
2602-
if (isKernelArgAnAccessor) {
2603-
Fn->setMetadata("kernel_arg_runtime_aligned",
2604-
llvm::MDNode::get(VMContext, argSYCLAccessorPtrs));
2605-
Fn->setMetadata("kernel_arg_exclusive_ptr",
2595+
if (getLangOpts().SYCLIsDevice) {
2596+
if (FD && FD->hasAttr<SYCLSimdAttr>()) {
2597+
Fn->setMetadata("kernel_arg_accessor_ptr",
26062598
llvm::MDNode::get(VMContext, argSYCLAccessorPtrs));
2607-
}
2608-
} else {
2609-
if (getLangOpts().OpenCL || getLangOpts().SYCLIsDevice) {
2610-
Fn->setMetadata("kernel_arg_addr_space",
2611-
llvm::MDNode::get(VMContext, addressQuals));
2612-
Fn->setMetadata("kernel_arg_access_qual",
2613-
llvm::MDNode::get(VMContext, accessQuals));
2614-
Fn->setMetadata("kernel_arg_type",
2615-
llvm::MDNode::get(VMContext, argTypeNames));
2616-
Fn->setMetadata("kernel_arg_base_type",
2617-
llvm::MDNode::get(VMContext, argBaseTypeNames));
2618-
Fn->setMetadata("kernel_arg_type_qual",
2619-
llvm::MDNode::get(VMContext, argTypeQuals));
2620-
if (IsEsimdFunction)
2621-
Fn->setMetadata("kernel_arg_accessor_ptr",
2599+
} else {
2600+
Fn->setMetadata("kernel_arg_buffer_location",
2601+
llvm::MDNode::get(VMContext, argSYCLBufferLocationAttr));
2602+
// Generate this metadata only if at least one kernel argument is an
2603+
// accessor.
2604+
if (isKernelArgAnAccessor) {
2605+
Fn->setMetadata("kernel_arg_runtime_aligned",
26222606
llvm::MDNode::get(VMContext, argSYCLAccessorPtrs));
2607+
Fn->setMetadata("kernel_arg_exclusive_ptr",
2608+
llvm::MDNode::get(VMContext, argSYCLAccessorPtrs));
2609+
}
26232610
}
2624-
if (getCodeGenOpts().EmitOpenCLArgMetadata ||
2625-
getCodeGenOpts().HIPSaveKernelArgName)
2626-
Fn->setMetadata("kernel_arg_name",
2627-
llvm::MDNode::get(VMContext, argNames));
26282611
}
2612+
2613+
if (getLangOpts().OpenCL) {
2614+
Fn->setMetadata("kernel_arg_addr_space",
2615+
llvm::MDNode::get(VMContext, addressQuals));
2616+
Fn->setMetadata("kernel_arg_access_qual",
2617+
llvm::MDNode::get(VMContext, accessQuals));
2618+
Fn->setMetadata("kernel_arg_type",
2619+
llvm::MDNode::get(VMContext, argTypeNames));
2620+
Fn->setMetadata("kernel_arg_base_type",
2621+
llvm::MDNode::get(VMContext, argBaseTypeNames));
2622+
Fn->setMetadata("kernel_arg_type_qual",
2623+
llvm::MDNode::get(VMContext, argTypeQuals));
2624+
}
2625+
if (getCodeGenOpts().EmitOpenCLArgMetadata ||
2626+
getCodeGenOpts().HIPSaveKernelArgName)
2627+
Fn->setMetadata("kernel_arg_name", llvm::MDNode::get(VMContext, argNames));
26292628
}
26302629

26312630
/// Determines whether the language options require us to model

‎clang/test/CodeGenSYCL/kernel-op-calls.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ int main() {
5353

5454
Q.submit([&](sycl::handler& cgh) {
5555
ESIMDFunctor EF;
56-
// CHECK: define dso_local spir_kernel void @_ZTS12ESIMDFunctor() {{.*}} !intel_reqd_sub_group_size !{{[0-9]+}} !work_group_size_hint !{{[0-9]+}} !kernel_arg_addr_space !{{[0-9]+}} !kernel_arg_access_qual !{{[0-9]+}} !kernel_arg_type !{{[0-9]+}} !kernel_arg_base_type !{{[0-9]+}} !kernel_arg_type_qual !{{[0-9]+}} !kernel_arg_accessor_ptr !{{[0-9]+}} !sycl_explicit_simd !{{[0-9]+}} !sycl_fixed_targets !{{[0-9]+}} {
56+
// CHECK: define dso_local spir_kernel void @_ZTS12ESIMDFunctor() {{.*}} !intel_reqd_sub_group_size !{{[0-9]+}} !work_group_size_hint !{{[0-9]+}} !kernel_arg_accessor_ptr !{{[0-9]+}} !sycl_explicit_simd !{{[0-9]+}} !sycl_fixed_targets !{{[0-9]+}} {
5757
cgh.parallel_for(sycl::range<1>(10), EF);
5858
});
5959

‎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

‎devops/dependencies-igc-dev.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"linux": {
33
"igc_dev": {
4-
"github_tag": "igc-dev-a9e1ef2",
5-
"version": "a9e1ef2",
6-
"updated_at": "2025-03-09T09:38:44Z",
7-
"url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/2717684926/zip",
4+
"github_tag": "igc-dev-81b4de2",
5+
"version": "81b4de2",
6+
"updated_at": "2025-03-29T17:38:03Z",
7+
"url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/2844658814/zip",
88
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
99
}
1010
}

‎llvm/cmake/modules/AddSecurityFlags.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ macro(add_link_option_ext flag name)
3131
endif()
3232
endmacro()
3333

34-
function(append_common_extra_security_flags)
34+
macro(append_common_extra_security_flags)
3535
if( LLVM_ON_UNIX )
3636
# Fortify Source (strongly recommended):
3737
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -70,7 +70,7 @@ function(append_common_extra_security_flags)
7070
CMAKE_EXE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS
7171
CMAKE_SHARED_LINKER_FLAGS)
7272
endif()
73-
endfunction()
73+
endmacro()
7474

7575
if ( EXTRA_SECURITY_FLAGS )
7676
if (EXTRA_SECURITY_FLAGS STREQUAL "none")

0 commit comments

Comments
 (0)