Skip to content

Commit 2736632

Browse files
committed
Merge remote-tracking branch 'origin/sycl' into llvmspirv_pulldown
2 parents 94f46ae + 23584c1 commit 2736632

File tree

223 files changed

+4869
-6209
lines changed

Some content is hidden

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

223 files changed

+4869
-6209
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
fetch-depth: 2
6161
- name: Get subprojects that have doc changes
6262
id: docs-changed-subprojects
63-
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1 # v45.0.1
63+
uses: step-security/changed-files@95b56dadb92a30ca9036f16423fd3c088a71ee94 # v46.0.5
6464
with:
6565
skip_initial_fetch: true
6666
base_sha: 'HEAD~1'

.github/workflows/hlsl-test-all.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
ninja check-hlsl-unit
8181
ninja ${{ inputs.TestTarget }}
8282
- name: Publish Test Results
83-
uses: EnricoMi/publish-unit-test-result-action/macos@afb2984f4d89672b2f9d9c13ae23d53779671984 # v2
83+
uses: EnricoMi/publish-unit-test-result-action/macos@3a74b2957438d0b6e2e61d67b05318aa25c9e6c6 # v2
8484
if: always() && runner.os == 'macOS'
8585
with:
8686
comment_mode: off

.github/workflows/libcxx-check-generated-files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616

1717
- name: Install dependencies
18-
uses: aminya/setup-cpp@6370aaa0252a93c71dcc4cf49397f46810eeda56 # v1.5.3
18+
uses: aminya/setup-cpp@9dc9c217f497fe7342eed97e6f200bf101c9cc04 # v1.6.2
1919
with:
2020
clangformat: 17.0.1
2121
ninja: true

.github/workflows/pr-code-format.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- name: Get changed files
2929
id: changed-files
30-
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1 # v45.0.1
30+
uses: step-security/changed-files@95b56dadb92a30ca9036f16423fd3c088a71ee94 # v46.0.5
3131
with:
3232
separator: ","
3333
skip_initial_fetch: true
@@ -55,7 +55,7 @@ jobs:
5555
echo "$CHANGED_FILES"
5656
5757
- name: Install clang-format
58-
uses: aminya/setup-cpp@6370aaa0252a93c71dcc4cf49397f46810eeda56 # v1.5.3
58+
uses: aminya/setup-cpp@9dc9c217f497fe7342eed97e6f200bf101c9cc04 # v1.6.2
5959
with:
6060
clangformat: 19.1.6
6161

.github/workflows/release-lit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
./llvm/utils/release/./github-upload-release.py --token "$GITHUB_TOKEN" --user ${{ github.actor }} --user-token "$USER_TOKEN" check-permissions
4646
4747
- name: Setup Cpp
48-
uses: aminya/setup-cpp@6370aaa0252a93c71dcc4cf49397f46810eeda56 # v1.5.3
48+
uses: aminya/setup-cpp@9dc9c217f497fe7342eed97e6f200bf101c9cc04 # v1.6.2
4949
with:
5050
compiler: llvm-16.0.6
5151
cmake: true

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
persist-credentials: false
3737

3838
- name: "Run analysis"
39-
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
39+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
4040
with:
4141
results_file: results.sarif
4242
results_format: sarif

.github/workflows/sycl-nightly.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,13 +284,14 @@ jobs:
284284
needs: [ubuntu2204_build]
285285
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
286286
strategy:
287+
fail-fast: false
287288
matrix:
289+
runner: ['["PVC_PERF"]', '["BMG_PERF"]']
290+
backend: ['level_zero:gpu']
288291
include:
289292
- ref: ${{ github.sha }}
290-
save_name: Baseline
291-
runner: '["PVC_PERF"]'
292-
backend: 'level_zero:gpu'
293-
preset: Minimal
293+
save_name: 'Baseline'
294+
preset: 'Minimal'
294295
uses: ./.github/workflows/sycl-linux-run-tests.yml
295296
secrets: inherit
296297
with:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ jobs:
187187
tests_selector: cts
188188
repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0' }}
189189
devops_ref: sycl
190-
tests_ref: ead7474b9cb2189ce48025550912ccad5a72bd30
190+
tests_ref: 87f8677c4b67cfe56ad6f09246036f10c306c977
191191
sycl_toolchain_artifact: sycl_linux_default
192192
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
193193
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}

.github/workflows/sycl-ur-perf-benchmarking.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ on:
7878
type: choice
7979
options:
8080
- '["PVC_PERF"]'
81+
- '["BMG_PERF"]'
8182
backend:
8283
description: Backend to use
8384
type: choice

clang/lib/Sema/SPIRVBuiltins.td

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,7 @@ class ConstOCLSPVBuiltin<string _Name, list<Type> _Signature> :
322322
// OpenCL v1.0/1.2/2.0 s6.1.1: Built-in Scalar Data Types.
323323
def Bool : IntType<"bool", QualType<"Context.BoolTy">, 1>;
324324
def TrueChar : IntType<"_char", QualType<"Context.CharTy", 0, 1>, 8>;
325-
def Char : IntType<"char", QualType<"Context.SignedCharTy", 0, 1>, 8>;
326-
def SChar : IntType<"schar", QualType<"Context.SignedCharTy", 0, 1>, 8>;
325+
def Char : IntType<"char", QualTypeFromFunction<"GetCharType", 0, 1>, 8>;
327326
def UChar : UIntType<"uchar", QualType<"Context.UnsignedCharTy">, 8>;
328327
def Short : IntType<"short", QualType<"Context.ShortTy", 0, 1>, 16>;
329328
def UShort : UIntType<"ushort", QualType<"Context.UnsignedShortTy">, 16>;
@@ -412,7 +411,7 @@ def IntLongFloatGenType1 : GenericType<"IntLongFloatGenType1", TLIntLongFloats
412411

413412
// GenType definitions for every single base type (e.g. fp32 only).
414413
// Names are like: GenTypeFloatVecAndScalar.
415-
foreach Type = [Char, UChar, SChar, Short, UShort,
414+
foreach Type = [Char, UChar, Short, UShort,
416415
Int, UInt, Long, ULong,
417416
Float, Double, Half] in {
418417
foreach VecSizes = [VecAndScalar, VecNoScalar] in {
@@ -872,16 +871,16 @@ foreach name = ["Dot"] in {
872871
}
873872

874873
foreach name = ["Any", "All"] in {
875-
def : SPVBuiltin<name, [Bool, GenTypeSCharVecNoScalar], Attr.Const>;
874+
def : SPVBuiltin<name, [Bool, GenTypeCharVecNoScalar], Attr.Const>;
876875
}
877876

878877
foreach name = ["IsNan", "IsInf", "IsFinite", "IsNormal", "SignBitSet"] in {
879878
def : SPVBuiltin<name, [Bool, Float], Attr.Const>;
880879
def : SPVBuiltin<name, [Bool, Double], Attr.Const>;
881880
def : SPVBuiltin<name, [Bool, Half], Attr.Const>;
882-
def : SPVBuiltin<name, [GenTypeSCharVecNoScalar, GenTypeFloatVecNoScalar], Attr.Const>;
883-
def : SPVBuiltin<name, [GenTypeSCharVecNoScalar, GenTypeDoubleVecNoScalar], Attr.Const>;
884-
def : SPVBuiltin<name, [GenTypeSCharVecNoScalar, GenTypeHalfVecNoScalar], Attr.Const>;
881+
def : SPVBuiltin<name, [GenTypeCharVecNoScalar, GenTypeFloatVecNoScalar], Attr.Const>;
882+
def : SPVBuiltin<name, [GenTypeCharVecNoScalar, GenTypeDoubleVecNoScalar], Attr.Const>;
883+
def : SPVBuiltin<name, [GenTypeCharVecNoScalar, GenTypeHalfVecNoScalar], Attr.Const>;
885884
}
886885

887886
foreach name = ["LessOrGreater",
@@ -895,9 +894,9 @@ foreach name = ["LessOrGreater",
895894
def : SPVBuiltin<name, [Bool, Float, Float], Attr.Const>;
896895
def : SPVBuiltin<name, [Bool, Double, Double], Attr.Const>;
897896
def : SPVBuiltin<name, [Bool, Half, Half], Attr.Const>;
898-
def : SPVBuiltin<name, [GenTypeSCharVecNoScalar, GenTypeFloatVecNoScalar, GenTypeFloatVecNoScalar], Attr.Const>;
899-
def : SPVBuiltin<name, [GenTypeSCharVecNoScalar, GenTypeDoubleVecNoScalar, GenTypeDoubleVecNoScalar], Attr.Const>;
900-
def : SPVBuiltin<name, [GenTypeSCharVecNoScalar, GenTypeHalfVecNoScalar, GenTypeHalfVecNoScalar], Attr.Const>;
897+
def : SPVBuiltin<name, [GenTypeCharVecNoScalar, GenTypeFloatVecNoScalar, GenTypeFloatVecNoScalar], Attr.Const>;
898+
def : SPVBuiltin<name, [GenTypeCharVecNoScalar, GenTypeDoubleVecNoScalar, GenTypeDoubleVecNoScalar], Attr.Const>;
899+
def : SPVBuiltin<name, [GenTypeCharVecNoScalar, GenTypeHalfVecNoScalar, GenTypeHalfVecNoScalar], Attr.Const>;
901900
}
902901

903902
foreach name = ["BitCount"] in {

0 commit comments

Comments
 (0)