Skip to content

Commit f8128cc

Browse files
committed
Merge branch 'sycl' into review/yang/statistics
2 parents 4dc75cc + 18081b9 commit f8128cc

File tree

536 files changed

+7853
-10453
lines changed

Some content is hidden

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

536 files changed

+7853
-10453
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ invoke_simd/ @intel/dpcpp-esimd-reviewers
9797
InvokeSimd/ @intel/dpcpp-esimd-reviewers
9898
sycl/test-e2e/InvokeSimd/ @intel/dpcpp-esimd-reviewers
9999

100-
# dev-igc driver update
101-
devops/dependencies-igc-dev.json @intel/sycl-matrix-reviewers @intel/dpcpp-esimd-reviewers @intel/dpcpp-devops-reviewers
102-
103100
# DevOps configs
104101
.github/ @intel/dpcpp-devops-reviewers
105102
buildbot/ @intel/dpcpp-devops-reviewers
106103
devops/ @intel/dpcpp-devops-reviewers
107104

105+
# dev-igc driver update
106+
devops/dependencies-igc-dev.json @intel/sycl-matrix-reviewers @intel/dpcpp-esimd-reviewers @intel/dpcpp-devops-reviewers
107+
108108
# Kernel fusion JIT compiler
109109
sycl-jit/ @intel/dpcpp-kernel-fusion-reviewers
110110
sycl/doc/design/KernelFusionJIT.md @intel/dpcpp-kernel-fusion-reviewers

.github/workflows/sycl-linux-precommit-aws.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
with:
6767
name: CUDA E2E
6868
runner: '["aws_cuda-${{ github.event.workflow_run.id }}-${{ github.event.workflow_run.run_attempt }}"]'
69-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest-0300ac924620a51f76c4929794637b82790f12ab
69+
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
7070
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
7171
target_devices: ext_oneapi_cuda:gpu
7272
# No idea why but that seems to work and be in sync with the main

.github/workflows/sycl-linux-precommit.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
build_artifact_suffix: "default"
4747
build_cache_suffix: "default"
4848
changes: ${{ needs.detect_changes.outputs.filters }}
49-
build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest-0300ac924620a51f76c4929794637b82790f12ab"
5049

5150
determine_arc_tests:
5251
name: Decide which Arc tests to run
@@ -100,7 +99,7 @@ jobs:
10099
env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }'
101100
- name: E2E tests with dev igc on Intel Arc A-Series Graphics
102101
runner: '["Linux", "arc"]'
103-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:${{ contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') && 'latest' || 'devigc' }}
102+
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:devigc
104103
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
105104
target_devices: level_zero:gpu;opencl:gpu
106105
reset_intel_gpu: true
@@ -110,6 +109,8 @@ jobs:
110109
use_dev_igc: ${{ contains(needs.detect_changes.outputs.filters, 'devigccfg') }}
111110
extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
112111
env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }'
112+
# Run only if the PR does not have the 'ci-no-devigc' label.
113+
skip_run: ${{ contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') }}
113114

114115
uses: ./.github/workflows/sycl-linux-run-tests.yml
115116
with:
@@ -123,6 +124,7 @@ jobs:
123124
use_dev_igc: ${{ matrix.use_dev_igc }}
124125
extra_lit_opts: ${{ matrix.extra_lit_opts }}
125126
env: ${{ matrix.env || '{}' }}
127+
skip_run: ${{ matrix.skip_run || 'false' }}
126128

127129
ref: ${{ github.sha }}
128130
merge_ref: ''

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ on:
7676
default: '{}'
7777
required: False
7878

79+
skip_run:
80+
type: string
81+
default: 'false'
82+
required: False
83+
7984
workflow_dispatch:
8085
inputs:
8186
runner:
@@ -146,6 +151,7 @@ permissions:
146151

147152
jobs:
148153
run:
154+
if: inputs.skip_run == 'false'
149155
name: ${{ inputs.name }}
150156
runs-on: ${{ fromJSON(inputs.runner) }}
151157
container:

.github/workflows/sycl-macos-build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
CCACHE_MAXSIZE: ${{ inputs.build_cache_size }}
3131
steps:
3232
- name: Install dependencies
33-
run: brew install ccache ninja hwloc
33+
run: brew install ccache ninja hwloc zstd
3434
- uses: actions/checkout@v4
3535
with:
3636
ref: ${{ inputs.build_ref }}

.github/workflows/sycl-post-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
reset_intel_gpu: true
6161
- name: AMD/HIP
6262
runner: '["Linux", "amdgpu"]'
63-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest-0300ac924620a51f76c4929794637b82790f12ab
63+
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
6464
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
6565
target_devices: ext_oneapi_hip:gpu
6666
reset_intel_gpu: false

clang/include/clang/Basic/CodeGenOptions.def

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -459,11 +459,6 @@ CODEGENOPT(SkipRaxSetup, 1, 0)
459459
ENUM_CODEGENOPT(ZeroCallUsedRegs, llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind,
460460
5, llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind::Skip)
461461

462-
/// Whether to expect -main-file-name to be an absolute path to use it for
463-
/// checksum calculations or not.
464-
CODEGENOPT(SYCLUseMainFileName, 1, 0)
465-
466-
467462
/// Modify C++ ABI to returning `this` pointer from constructors and
468463
/// non-deleting destructors. (No effect on Microsoft ABI.)
469464
CODEGENOPT(CtorDtorReturnThis, 1, 0)

clang/include/clang/Basic/CodeGenOptions.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,6 @@ class CodeGenOptions : public CodeGenOptionsBase {
258258
/// file, for example with -save-temps.
259259
std::string MainFileName;
260260

261-
/// The user provided name for the "main file", with its full path.
262-
std::string FullMainFileName;
263-
264261
/// The name for the split debug info file used for the DW_AT_[GNU_]dwo_name
265262
/// attribute in the skeleton CU.
266263
std::string SplitDwarfFile;

clang/include/clang/Basic/DiagnosticDriverKinds.td

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,6 @@ def warn_drv_mismatch_fpga_archive : Warning<
219219
def warn_drv_sycl_native_cpu_and_targets: Warning<
220220
"-fsycl-targets=native_cpu overrides SYCL targets option">,
221221
InGroup<SyclNativeCPUTargets>;
222-
def err_drv_unsupported_opt_sycl : Error<
223-
"option '%0' not supported with SYCL compilation">;
224222
def err_drv_argument_only_allowed_with : Error<
225223
"invalid argument '%0' only allowed with '%1'">;
226224
def err_drv_opt_unsupported_input_type : Error<

clang/include/clang/Basic/LangOptions.def

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ LANGOPT(SYCLAllowFuncPtr , 1, 0, "Allow function pointers in SYCL device code")
302302
LANGOPT(SYCLStdLayoutKernelParams, 1, 0, "Enable standard layout requirement for SYCL kernel parameters")
303303
LANGOPT(SYCLUnnamedLambda , 1, 0, "Allow unnamed lambda SYCL kernels")
304304
LANGOPT(SYCLForceInlineKernelLambda , 1, 0, "Force inline SYCL kernel lambdas in entry point")
305+
LANGOPT(SYCLAllowAllFeaturesInConstexpr, 1, 0, "Allow all C++ features in SYCL device code in manifestly constant-evaluated expressions")
305306
LANGOPT(SYCLESIMDForceStatelessMem, 1, 0, "Make accessors use USM memory in ESIMD kernels")
306307
LANGOPT(SYCLESIMDBuildHostCode, 1, 1, "Build the host implementation of ESIMD functions")
307308
ENUM_LANGOPT(SYCLVersion , SYCLMajorVersion, 2, SYCL_None, "Version of the SYCL standard used")

0 commit comments

Comments
 (0)