Skip to content

[SYCL][NVPTX] Obey -fcuda-short-ptr when compiling SYCL for NVPTX #15642

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
merged 7 commits into from
Dec 11, 2024
Merged

[SYCL][NVPTX] Obey -fcuda-short-ptr when compiling SYCL for NVPTX #15642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fdc2ad6
[SYCL][NVPTX] Enable -fcuda-short-ptr by default
frasercrmck Oct 9, 2024
9ec2d4c
Merge remote-tracking branch 'origin/sycl' into sycl-nvptx-short-ptrs
frasercrmck Dec 3, 2024
9ceb7d3
reduce scope of PR
frasercrmck Dec 3, 2024
4b1ce3b
add tests
frasercrmck Dec 3, 2024
4243e07
remove requires from test
frasercrmck Dec 3, 2024
b2301c3
Merge remote-tracking branch 'origin/sycl' into sycl-nvptx-short-ptrs
frasercrmck Dec 9, 2024
516261c
update test with comments and more checks
frasercrmck Dec 9, 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/ToolChains/Clang.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8593,7 +8593,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
}
}

if (IsCuda) {
// Propagate -fcuda-short-ptr if compiling CUDA or SYCL for NVPTX
if (IsCuda || (IsSYCLDevice && Triple.isNVPTX())) {
if (Args.hasFlag(options::OPT_fcuda_short_ptr,
options::OPT_fno_cuda_short_ptr, false))
CmdArgs.push_back("-fcuda-short-ptr");
Expand Down
27 changes: 27 additions & 0 deletions clang/test/CodeGenSYCL/nvptx-short-ptr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Check that when we see the expected data layouts for NVPTX when we pass the
// -nvptx-short-ptr option.

// RUN: %clang_cc1 -fsycl-is-device -disable-llvm-passes \
// RUN: -triple nvptx-nvidia-cuda -emit-llvm %s -o - \
// RUN: | FileCheck %s --check-prefix CHECK32

// RUN: %clang_cc1 -fsycl-is-device -disable-llvm-passes \
// RUN: -triple nvptx-nvidia-cuda -emit-llvm -fcuda-short-ptr -mllvm -nvptx-short-ptr %s -o - \
// RUN: | FileCheck %s --check-prefix CHECK32

// RUN: %clang_cc1 -fsycl-is-device -disable-llvm-passes \
// RUN: -triple nvptx64-nvidia-cuda -emit-llvm %s -o - \
// RUN: | FileCheck %s --check-prefix CHECK64-DEFAULT

// RUN: %clang_cc1 -fsycl-is-device -disable-llvm-passes \
// RUN: -triple nvptx64-nvidia-cuda -emit-llvm -fcuda-short-ptr -mllvm -nvptx-short-ptr %s -o - \
// RUN: | FileCheck %s --check-prefix CHECK64-SHORT

// Targeting a 32-bit NVPTX, check that we see universal 32-bit pointers (the
// option changes nothing)
// CHECK32: target datalayout = "e-p:32:32-i64:64-i128:128-v16:16-v32:32-n16:32:64"

// Targeting a 64-bit NVPTX target, check that we see 32-bit pointers for
// shared (3), const (4), and local (5) address spaces only.
// CHECK64-DEFAULT: target datalayout = "e-i64:64-i128:128-v16:16-v32:32-n16:32:64"
// CHECK64-SHORT: target datalayout = "e-p3:32:32-p4:32:32-p5:32:32-i64:64-i128:128-v16:16-v32:32-n16:32:64"
14 changes: 14 additions & 0 deletions clang/test/Driver/sycl-nvptx-short-ptr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// RUN: %clang -### -nocudalib \
// RUN: -fsycl -fsycl-targets=nvptx64-nvidia-cuda %s 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-DEFAULT %s

// RUN: %clang -### -nocudalib \
// RUN: -fsycl -fsycl-targets=nvptx64-nvidia-cuda -fcuda-short-ptr %s 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-SHORT %s


// CHECK-SHORT: "-mllvm" "--nvptx-short-ptr"
// CHECK-SHORT: "-fcuda-short-ptr"

// CHECK-DEFAULT-NOT: "--nvptx-short-ptr"
// CHECK-DEFAULT-NOT: "-fcuda-short-ptr"
Loading