Skip to content

Commit 3a2b39d

Browse files
author
iclsrc
committed
Merge from 'sycl' to 'sycl-web'
2 parents 4f8ab93 + 64fb410 commit 3a2b39d

File tree

64 files changed

+1720
-1516
lines changed

Some content is hidden

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

64 files changed

+1720
-1516
lines changed

.github/CODEOWNERS

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ sycl/doc/extensions/ @intel/dpcpp-specification-reviewers
3636

3737
# Level Zero plugin
3838
sycl/plugins/level_zero/ @intel/dpcpp-l0-pi-reviewers
39+
sycl/test-e2e/Plugin/*level-zero* @intel/dpcpp-l0-pi-reviewers
3940

4041
# Unified Runtime plugin
4142
sycl/plugins/unified_runtime/ @intel/dpcpp-l0-pi-reviewers
@@ -84,6 +85,7 @@ esimd/ @intel/dpcpp-esimd-reviewers
8485
sycl/include/sycl/ext/intel/esimd.hpp @intel/dpcpp-esimd-reviewers
8586
sycl/doc/extensions/**/sycl_ext_intel_esimd/ @intel/dpcpp-esimd-reviewers
8687
llvm/lib/SYCLLowerIR/CMakeLists.txt @intel/dpcpp-tools-reviewers @intel/dpcpp-esimd-reviewers
88+
sycl/test-e2e/ESIMD/ @intel/dpcpp-esimd-reviewers
8789

8890
# invoke_simd
8991
sycl/include/sycl/ext/oneapi/experimental/invoke_simd.hpp @intel/dpcpp-esimd-reviewers @rolandschulz
@@ -92,6 +94,7 @@ llvm/lib/SYCLLowerIR/LowerInvokeSimd.cpp @intel/dpcpp-esimd-reviewers
9294
llvm/include/llvm/SYCLLowerIR/LowerInvokeSimd.h @intel/dpcpp-esimd-reviewers
9395
invoke_simd/ @intel/dpcpp-esimd-reviewers
9496
InvokeSimd/ @intel/dpcpp-esimd-reviewers
97+
sycl/test-e2e/InvokeSimd/ @intel/dpcpp-esimd-reviewers
9598

9699
# DevOps configs
97100
.github/ @intel/dpcpp-devops-reviewers
@@ -146,14 +149,10 @@ sycl/source/detail/bindless* @intel/bindless-images-reviewers
146149
sycl/plugins/unified_runtime/ur/adapters/**/image.* @intel/bindless-images-reviewers
147150
sycl/test-e2e/bindless_images/ @intel/bindless-images-reviewers
148151

149-
# sycl e2e tests
150-
sycl/test-e2e/ @intel/llvm-reviewers-runtime
151-
sycl/test-e2e/Plugin/*level-zero* @intel/dpcpp-l0-pi-reviewers
152-
sycl/test-e2e/ESIMD/ @intel/dpcpp-esimd-reviewers
153-
sycl/test-e2e/InvokeSimd/ @intel/dpcpp-esimd-reviewers
152+
# Miscellaneous sycl e2e tests
154153
sycl/test-e2e/BFloat16/ @intel/dpcpp-tools-reviewers @intel/llvm-reviewers-runtime
155-
sycl/test-e2e/AOT/ @intel/dpcpp-tools-reviewers
156-
sycl/test-e2e/DeviceCodeSplit/ @intel/dpcpp-tools-reviewers
154+
sycl/test-e2e/AOT/ @intel/dpcpp-tools-reviewers
155+
sycl/test-e2e/DeviceCodeSplit/ @intel/dpcpp-tools-reviewers
157156
sycl/test-e2e/SeparateCompile/ @intel/dpcpp-tools-reviewers
158157
sycl/test-e2e/Printf/ @intel/dpcpp-tools-reviewers @intel/llvm-reviewers-runtime
159158
sycl/test-e2e/SpecConstants/ @intel/dpcpp-tools-reviewers

clang/include/clang/Driver/Action.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,11 +629,20 @@ class OffloadUnbundlingJobAction final : public JobAction {
629629
DependentOffloadKind(DependentOffloadKind) {}
630630
};
631631

632+
/// Allow for a complete override of the target to unbundle.
633+
/// This is used for specific unbundles used for SYCL AOT when generating full
634+
/// device files that are bundled with the host object.
635+
void setTargetString(std::string Target) { TargetString = Target; }
636+
637+
std::string getTargetString() const { return TargetString; }
638+
632639
private:
633640
/// Container that keeps information about each dependence of this unbundling
634641
/// action.
635642
SmallVector<DependentActionInfo, 6> DependentActionInfoArray;
636643

644+
std::string TargetString;
645+
637646
public:
638647
// Offloading unbundling doesn't change the type of output.
639648
OffloadUnbundlingJobAction(Action *Input);

clang/include/clang/Driver/Options.td

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3866,7 +3866,14 @@ def ftarget_register_alloc_mode_EQ : Joined<["-"], "ftarget-register-alloc-mode=
38663866
HelpText<"Specify a register allocation mode for specific hardware for use by supported "
38673867
"target backends.">;
38683868
def : Flag<["-"], "fsycl-rdc">, Visibility<[ClangOption, CLOption, DXCOption]>, Alias<fgpu_rdc>;
3869-
def : Flag<["-"], "fno-sycl-rdc">, Visibility<[ClangOption, CLOption, DXCOption]>, Alias<fno_gpu_rdc>;
3869+
def : Flag<["-"], "fno-sycl-rdc">,
3870+
Visibility<[ClangOption, CLOption, DXCOption]>, Alias<fno_gpu_rdc>,
3871+
HelpText<"Generate relocatable device code during SYCL offload target "
3872+
"compilation. Use of ‘-fno-sycl-rdc’ in combination with ‘-c’ will "
3873+
"produce final device binaries within the generated fat object. "
3874+
"When using this option, each kernel must be self-contained within "
3875+
"its translation unit (source file). Therefore, the use of "
3876+
"SYCL_EXTERNAL is disallowed when this option is enabled.">;
38703877
def fsycl_optimize_non_user_code : Flag<["-"], "fsycl-optimize-non-user-code">,
38713878
Visibility<[ClangOption, CLOption, DXCOption, CC1Option]>,
38723879
MarshallingInfoFlag<CodeGenOpts<"OptimizeSYCLFramework">>,

0 commit comments

Comments
 (0)