Skip to content

Commit fdc5148

Browse files
author
iclsrc
committed
Merge from 'sycl' to 'sycl-web'
2 parents 0d1183e + 909459b commit fdc5148

File tree

133 files changed

+2931
-2587
lines changed

Some content is hidden

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

133 files changed

+2931
-2587
lines changed

‎buildbot/dependency.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ocl_cpu_rt_ver=2020.11.10.0.05
44
# https://github.com/intel/llvm/releases/download/2020-WW41/win-oclcpuexp-2020.11.10.0.05_rel.zip
55
ocl_cpu_rt_ver_win=2020.11.10.0.05
66
# Same GPU driver supports Level Zero and OpenCL:
7-
# https://github.com/intel/compute-runtime/releases/tag/20.39.17972
8-
ocl_gpu_rt_ver=20.39.17972
7+
# https://github.com/intel/compute-runtime/releases/tag/20.41.18123
8+
ocl_gpu_rt_ver=20.41.18123
99
# Same GPU driver supports Level Zero and OpenCL:
1010
# https://downloadmirror.intel.com/29879/a08/igfx_win10_100.8778.zip
1111
ocl_gpu_rt_ver_win=27.20.100.8778
@@ -24,7 +24,7 @@ fpga_ver_win=20200913_000017
2424
[DRIVER VERSIONS]
2525
cpu_driver_lin=2020.11.10.0.05
2626
cpu_driver_win=2020.11.10.0.05
27-
gpu_driver_lin=20.39.17972
27+
gpu_driver_lin=20.41.18123
2828
gpu_driver_win=27.20.100.8778
2929
fpga_driver_lin=2020.11.10.0.05
3030
fpga_driver_win=2020.11.10.0.05

‎clang/lib/Driver/Driver.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3743,6 +3743,16 @@ class OffloadingActionBuilder final {
37433743
for (auto SDA : SYCLDeviceActions)
37443744
SYCLLinkBinaryList.push_back(SDA);
37453745
if (WrapDeviceOnlyBinary) {
3746+
// If used without -fintelfpga, -fsycl-link is used to wrap device
3747+
// objects for future host link. Device libraries should be linked
3748+
// by default to resolve any undefined reference.
3749+
if (!Args.hasArg(options::OPT_fintelfpga)) {
3750+
const auto *TC = ToolChains.front();
3751+
addSYCLDeviceLibs(TC, SYCLLinkBinaryList, true,
3752+
C.getDefaultToolChain()
3753+
.getTriple()
3754+
.isWindowsMSVCEnvironment());
3755+
}
37463756
// -fsycl-link behavior does the following to the unbundled device
37473757
// binaries:
37483758
// 1) Link them together using llvm-link

‎clang/lib/Driver/ToolChains/SYCL.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ static void addImpliedArgs(const llvm::Triple &Triple,
510510
if (!A->getOption().matches(options::OPT_g0))
511511
BeArgs.push_back("-g");
512512
if (Args.getLastArg(options::OPT_O0))
513-
BeArgs.push_back(IsGen ? "-O0" : "-cl-opt-disable");
513+
BeArgs.push_back("-cl-opt-disable");
514514
if (BeArgs.empty())
515515
return;
516516
if (Triple.getSubArch() == llvm::Triple::NoSubArch ||

‎clang/test/Driver/sycl-offload.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -416,9 +416,9 @@
416416

417417
/// Check -fsycl-link behaviors unbundle
418418
// RUN: touch %t.o
419-
// RUN: %clang -### -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -o %t.out -fsycl-link %t.o 2>&1 \
419+
// RUN: %clang -### -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -o %t.out -fsycl-link -fno-sycl-device-lib=all %t.o 2>&1 \
420420
// RUN: | FileCheck -check-prefix=CHK-LINK-UB %s
421-
// RUN: %clang_cl -### -ccc-print-phases -fsycl -o %t.out -fsycl-link %t.o 2>&1 \
421+
// RUN: %clang_cl -### -ccc-print-phases -fsycl -o %t.out -fsycl-link -fno-sycl-device-lib=all %t.o 2>&1 \
422422
// RUN: | FileCheck -check-prefix=CHK-LINK-UB %s
423423
// CHK-LINK-UB: 0: input, "[[INPUT:.+\.o]]", object
424424
// CHK-LINK-UB: 1: clang-offload-unbundler, {0}, object
@@ -431,9 +431,9 @@
431431
/// ###########################################################################
432432

433433
/// Check -fsycl-link behaviors from source
434-
// RUN: %clang -### -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -o %t.out -fsycl-link %s 2>&1 \
434+
// RUN: %clang -### -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -o %t.out -fsycl-link -fno-sycl-device-lib=all %s 2>&1 \
435435
// RUN: | FileCheck -check-prefix=CHK-LINK %s
436-
// RUN: %clang_cl -### -ccc-print-phases -fsycl -o %t.out -fsycl-link %s 2>&1 \
436+
// RUN: %clang_cl -### -ccc-print-phases -fsycl -o %t.out -fsycl-link -fno-sycl-device-lib=all %s 2>&1 \
437437
// RUN: | FileCheck -check-prefix=CHK-LINK %s
438438
// CHK-LINK: 0: input, "[[INPUT:.+\.c]]", c++, (device-sycl)
439439
// CHK-LINK: 1: preprocessor, {0}, c++-cpp-output, (device-sycl)
@@ -758,7 +758,7 @@
758758
// RUN: | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-OPTS-GEN %s
759759
// RUN: %clang_cl -### -fsycl -fsycl-targets=spir64_gen-unknown-unknown-sycldevice -Zi -Od -Xsycl-target-backend "-DFOO1 -DFOO2" %s 2>&1 \
760760
// RUN: | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-OPTS-GEN %s
761-
// CHK-TOOLS-IMPLIED-OPTS-GEN: ocloc{{.*}} "-options" "-g -O0" "-DFOO1" "-DFOO2"
761+
// CHK-TOOLS-IMPLIED-OPTS-GEN: ocloc{{.*}} "-options" "-g -cl-opt-disable" "-DFOO1" "-DFOO2"
762762

763763
/// Check -Xsycl-target-linker option passing
764764
// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_fpga-unknown-unknown-sycldevice -Xsycl-target-linker "-DFOO1 -DFOO2" %s 2>&1 \

‎libclc/generic/include/spirv/spirv_types.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,10 @@ enum FPRoundingMode {
4040
SPV_RTN = 3,
4141
};
4242

43+
enum GroupOperation {
44+
Reduce = 0,
45+
InclusiveScan = 1,
46+
ExclusiveScan = 2,
47+
};
48+
4349
#endif // CLC_SPIRV_TYPES

‎libclc/ptx-nvidiacl/libspirv/SOURCES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,5 @@ workitem/get_sub_group_local_id.cl
8383
workitem/get_sub_group_size.cl
8484
images/image_helpers.ll
8585
images/image.cl
86+
group/collectives_helpers.ll
87+
group/collectives.cl

0 commit comments

Comments
 (0)