Skip to content

[SYCL][NATIVECPU] Avoid overwriting offload kind on Native CPU #12971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dm-vodopyanov merged 19 commits into from
Mar 14, 2024
Merged

[SYCL][NATIVECPU] Avoid overwriting offload kind on Native CPU #12971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7533255
[wip] use ock main branch
PietroGhg Mar 6, 2024
8122f57
update ock tag
PietroGhg Mar 6, 2024
cf4f4ab
Merge branch 'sycl' into pietro/use_ock_main
PietroGhg Mar 6, 2024
1a17161
Add cmake variables for repo/tag
PietroGhg Mar 6, 2024
a440e1d
Merge branch 'sycl' into pietro/use_ock_main
PietroGhg Mar 6, 2024
9c869b6
add newline
PietroGhg Mar 6, 2024
9896047
simplify install for multi_llvm
PietroGhg Mar 7, 2024
54d11dd
use set() for string options
PietroGhg Mar 7, 2024
abee76f
Fix typo
PietroGhg Mar 7, 2024
769a678
Merge branch 'sycl' into pietro/use_ock_main
PietroGhg Mar 8, 2024
88050ef
update ock tag
PietroGhg Mar 8, 2024
1198666
Merge branch 'sycl' into pietro/use_ock_main
PietroGhg Mar 8, 2024
a3344d5
Merge branch 'pietro/use_ock_main' into pietro/native_cpu_driver
PietroGhg Mar 11, 2024
39b0f63
Merge branch 'sycl' into pietro/native_cpu_driver
PietroGhg Mar 11, 2024
7158d98
Avoid overwriting offload kind on Native CPU
PietroGhg Mar 11, 2024
f672614
Remove newline
PietroGhg Mar 11, 2024
b6ea726
Update lit test
PietroGhg Mar 11, 2024
e780f7d
update check for native cpu
PietroGhg Mar 12, 2024
22c6be5
fix linker stage check
PietroGhg Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9091,7 +9091,8 @@ InputInfoList Driver::BuildJobsForActionNoCache(
// in this instance
Action::OffloadKind DependentOffloadKind;
if (UI.DependentOffloadKind == Action::OFK_SYCL &&
TargetDeviceOffloadKind == Action::OFK_None)
TargetDeviceOffloadKind == Action::OFK_None &&
!(isSYCLNativeCPU(Args) && isSYCLNativeCPU(C.getDefaultToolChain().getTriple(), TC->getTriple())))
DependentOffloadKind = Action::OFK_Host;
else
DependentOffloadKind = UI.DependentOffloadKind;
Expand Down
18 changes: 18 additions & 0 deletions clang/test/Driver/sycl-native-cpu-fsycl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
//RUN: %clang -fsycl -fsycl-targets=native_cpu -fsycl-libspirv-path=%S/Inputs/SYCL/libspirv.bc -### %s 2>&1 | FileCheck %s --check-prefix=CHECK_INVO
//RUN: %clang -fsycl -fsycl-targets=native_cpu -fsycl-libspirv-path=%S/Inputs/SYCL/libspirv.bc -target aarch64-unknown-linux-gnu -ccc-print-phases %s 2>&1 | FileCheck %s --check-prefix=CHECK_ACTIONS-AARCH64

//Link together multiple TUs.
//RUN: touch %t_1.o
//RUN: touch %t_2.o
//RUN: %clang -fsycl -fsycl-targets=native_cpu -fsycl-libspirv-path=%S/Inputs/SYCL/libspirv.bc %t_1.o %t_2.o -ccc-print-bindings 2>&1 | FileCheck %s --check-prefix=CHECK_BINDINGS_MULTI_TU


//CHECK_ACTIONS: +- 0: input, "{{.*}}sycl-native-cpu-fsycl.cpp", c++, (host-sycl)
//CHECK_ACTIONS: +- 1: append-footer, {0}, c++, (host-sycl)
Expand Down Expand Up @@ -45,3 +50,16 @@
//CHECK_ACTIONS-AARCH64: +- 6: offload, "host-sycl (aarch64-unknown-linux-gnu)" {2}, "device-sycl (aarch64-unknown-linux-gnu)" {5}, c++-cpp-output
//CHECK_ACTIONS-AARCH64:|- 15: offload, "device-sycl (aarch64-unknown-linux-gnu)" {14}, object
//CHECK_ACTIONS-AARCH64:|- 18: offload, "device-sycl (aarch64-unknown-linux-gnu)" {17}, object

// checks that bindings are correct when linking together multiple TUs on native cpu
//CHECK_BINDINGS_MULTI_TU:# "{{.*}}" - "offload bundler", inputs: ["{{.*}}.o"], outputs: ["[[FILE1HOST:.*]].o", "[[FILE1DEV:.*]].o"]
//CHECK_BINDINGS_MULTI_TU:# "{{.*}}" - "offload bundler", inputs: ["{{.*}}.o"], outputs: ["[[FILE2HOST:.*]].o", "[[FILE2DEV:.*]].o"]
//CHECK_BINDINGS_MULTI_TU:# "{{.*}}" - "Convert SPIR-V to LLVM-IR if needed", inputs: ["[[FILE1DEV]].o"], output: "[[FILE1SPV:.*]].bc"
//CHECK_BINDINGS_MULTI_TU:# "{{.*}}" - "Convert SPIR-V to LLVM-IR if needed", inputs: ["[[FILE2DEV]].o"], output: "[[FILE2SPV:.*]].bc"
//CHECK_BINDINGS_MULTI_TU:# "{{.*}}" - "SYCL::Linker", inputs: ["[[FILE1SPV]].bc", "[[FILE2SPV]].bc"], output: "[[LINK1:.*]].bc"
//CHECK_BINDINGS_MULTI_TU:# "{{.*}}" - "SYCL::Linker", inputs: ["[[LINK1]].bc", "{{.*}}.bc"], output: "[[LINK2:.*]].bc"
//CHECK_BINDINGS_MULTI_TU:# "{{.*}}" - "clang", inputs: ["[[LINK2]].bc"], output: "[[KERNELO:.*]].o"
//CHECK_BINDINGS_MULTI_TU:# "{{.*}}" - "SYCL post link", inputs: ["[[LINK2]].bc"], output: "[[POSTL:.*]].table"
//CHECK_BINDINGS_MULTI_TU:# "{{.*}}" - "offload wrapper", inputs: ["[[POSTL]].table"], output: "[[WRAP:.*]].o"
//CHECK_BINDINGS_MULTI_TU:# "{{.*}}" - "{{.*}}::Linker", inputs: ["[[FILE1HOST]].o", "[[FILE2HOST]].o", "[[KERNELO]].o", "[[WRAP]].o"], output: "{{.*}}"