This is an archive of the discontinued LLVM Phabricator instance.

Differential D114812

[CUDA][HIP] Add pre-defined macro `__CLANG_RDC__`
ClosedPublic

Authored by yaxunl on Nov 30 2021, 12:01 PM.

Details

Reviewers
tra
Commits
rGd55f05d9f7dc: [CUDA][HIP] Add pre-defined macro `__CLANG_RDC__`
Summary

nvcc defines __CUDACC_RDC__ for both host and
device compilation when -rdc=true is specified
(https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#nvcc-identification-macro)

This patch defines __CLANG_RDC__ when -fgpu-rdc
is specified for CUDA/HIP.

Diff Detail

Event Timeline

yaxunl requested review of this revision.Nov 30 2021, 12:01 PM
yaxunl created this revision.

I am not sure whether we want to define a similar macro for cuda-clang.

Maybe __CLANG_RDC__ is better?

tra added a comment.Nov 30 2021, 12:06 PM
In D114812#3162282, @yaxunl wrote:

I am not sure whether we want to define a similar macro for cuda-clang.

Maybe __CLANG_RDC__ is better?

I think it would make sense. For CUDA compatibility we can the define CUDACC_RDC in the wrapper headers.

Harbormaster completed remote builds in B136744: Diff 390775.Nov 30 2021, 12:31 PM
yaxunl updated this revision to Diff 392205.Dec 6 2021, 3:23 PM
yaxunl retitled this revision from [HIP] Add pre-defined macro `__HIPCC_RDC__` to [CUDA][HIP] Add pre-defined macro `__CLANG_RDC__`.
yaxunl edited the summary of this revision. (Show Details)
Herald added a subscriber: carlosgalvezp. · View Herald TranscriptDec 6 2021, 3:23 PM
tra accepted this revision.Dec 6 2021, 3:42 PM
This revision is now accepted and ready to land.Dec 6 2021, 3:42 PM
Harbormaster completed remote builds in B137765: Diff 392205.Dec 6 2021, 3:56 PM
Closed by commit rGd55f05d9f7dc: [CUDA][HIP] Add pre-defined macro `__CLANG_RDC__` (authored by yaxunl). · Explain WhyDec 7 2021, 3:10 PM
This revision was automatically updated to reflect the committed changes.
yaxunl added a commit: rGd55f05d9f7dc: [CUDA][HIP] Add pre-defined macro `__CLANG_RDC__`.
Herald added a project: Restricted Project. · View Herald TranscriptDec 7 2021, 3:10 PM

Revision Contents

PathSize
clang/
lib/
Frontend/
8 lines
test/
Preprocessor/
38 lines

Diff 392560

clang/lib/Frontend/InitPreprocessor.cpp

Show First 20 Lines • Show All 494 Lines • ▼ Show 20 Lines if (LangOpts.getSYCLVersion() == LangOptions::SYCL_2017)
Builder.defineMacro("CL_SYCL_LANGUAGE_VERSION", "121"); Builder.defineMacro("CL_SYCL_LANGUAGE_VERSION", "121");
else if (LangOpts.getSYCLVersion() == LangOptions::SYCL_2020) else if (LangOpts.getSYCLVersion() == LangOptions::SYCL_2020)
Builder.defineMacro("SYCL_LANGUAGE_VERSION", "202001"); Builder.defineMacro("SYCL_LANGUAGE_VERSION", "202001");
} }
// Not "standard" per se, but available even with the -undef flag. // Not "standard" per se, but available even with the -undef flag.
if (LangOpts.AsmPreprocessor) if (LangOpts.AsmPreprocessor)
Builder.defineMacro("__ASSEMBLER__"); Builder.defineMacro("__ASSEMBLER__");
if (LangOpts.CUDA && !LangOpts.HIP) if (LangOpts.CUDA) {
if (LangOpts.GPURelocatableDeviceCode)
Builder.defineMacro("__CLANG_RDC__");
if (!LangOpts.HIP)
Builder.defineMacro("__CUDA__"); Builder.defineMacro("__CUDA__");
}
if (LangOpts.HIP) { if (LangOpts.HIP) {
Builder.defineMacro("__HIP__"); Builder.defineMacro("__HIP__");
Builder.defineMacro("__HIPCC__"); Builder.defineMacro("__HIPCC__");
Builder.defineMacro("__HIP_MEMORY_SCOPE_SINGLETHREAD", "1"); Builder.defineMacro("__HIP_MEMORY_SCOPE_SINGLETHREAD", "1");
Builder.defineMacro("__HIP_MEMORY_SCOPE_WAVEFRONT", "2"); Builder.defineMacro("__HIP_MEMORY_SCOPE_WAVEFRONT", "2");
Builder.defineMacro("__HIP_MEMORY_SCOPE_WORKGROUP", "3"); Builder.defineMacro("__HIP_MEMORY_SCOPE_WORKGROUP", "3");
Builder.defineMacro("__HIP_MEMORY_SCOPE_AGENT", "4"); Builder.defineMacro("__HIP_MEMORY_SCOPE_AGENT", "4");
Builder.defineMacro("__HIP_MEMORY_SCOPE_SYSTEM", "5"); Builder.defineMacro("__HIP_MEMORY_SCOPE_SYSTEM", "5");
▲ Show 20 Lines • Show All 793 Lines • Show Last 20 Lines

clang/test/Preprocessor/predefined-macros.c

Show First 20 Lines • Show All 218 Lines • ▼ Show 20 Lines
// RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spirv64-unknown-unknown \ // RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spirv64-unknown-unknown \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-SPIRV64 // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-SPIRV64
// CHECK-SPIRV64-DAG: #define __IMAGE_SUPPORT__ 1 // CHECK-SPIRV64-DAG: #define __IMAGE_SUPPORT__ 1
// CHECK-SPIRV64-DAG: #define __SPIRV__ 1 // CHECK-SPIRV64-DAG: #define __SPIRV__ 1
// CHECK-SPIRV64-DAG: #define __SPIRV64__ 1 // CHECK-SPIRV64-DAG: #define __SPIRV64__ 1
// CHECK-SPIRV64-NOT: #define __SPIRV32__ 1 // CHECK-SPIRV64-NOT: #define __SPIRV32__ 1
// RUN: %clang_cc1 %s -E -dM -o - -x hip -triple amdgcn-amd-amdhsa \ // RUN: %clang_cc1 %s -E -dM -o - -x hip -triple x86_64-unknown-linux-gnu \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-HIP // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-HIP
// CHECK-HIP-NOT: #define __CUDA_ARCH__
// CHECK-HIP: #define __HIPCC__ 1 // CHECK-HIP: #define __HIPCC__ 1
// CHECK-HIP-NOT: #define __HIP_DEVICE_COMPILE__ 1
// CHECK-HIP: #define __HIP__ 1 // CHECK-HIP: #define __HIP__ 1
// RUN: %clang_cc1 %s -E -dM -o - -x cuda -triple x86_64-unknown-linux-gnu \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CUDA-NEG
// CHECK-CUDA-NEG-NOT: #define __CLANG_RDC__ 1
// RUN: %clang_cc1 %s -E -dM -o - -x hip -triple x86_64-unknown-linux-gnu \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-HIP-NEG
// CHECK-HIP-NEG-NOT: #define __CUDA_ARCH__
// CHECK-HIP-NEG-NOT: #define __HIP_DEVICE_COMPILE__ 1
// CHECK-HIP-NEG-NOT: #define __CLANG_RDC__ 1
// RUN: %clang_cc1 %s -E -dM -o - -x hip -triple amdgcn-amd-amdhsa \ // RUN: %clang_cc1 %s -E -dM -o - -x hip -triple amdgcn-amd-amdhsa \
// RUN: -fcuda-is-device \ // RUN: -fcuda-is-device \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-HIP-DEV // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-HIP-DEV
// CHECK-HIP-DEV-NOT: #define __CUDA_ARCH__
// CHECK-HIP-DEV: #define __HIPCC__ 1 // CHECK-HIP-DEV: #define __HIPCC__ 1
// CHECK-HIP-DEV: #define __HIP_DEVICE_COMPILE__ 1 // CHECK-HIP-DEV: #define __HIP_DEVICE_COMPILE__ 1
// CHECK-HIP-DEV: #define __HIP__ 1 // CHECK-HIP-DEV: #define __HIP__ 1
// RUN: %clang_cc1 %s -E -dM -o - -x cuda -triple nvptx \
// RUN: -fcuda-is-device \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CUDA-DEV-NEG
// CHECK-CUDA-DEV-NEG-NOT: #define __CLANG_RDC__ 1
// RUN: %clang_cc1 %s -E -dM -o - -x hip -triple amdgcn-amd-amdhsa \
// RUN: -fcuda-is-device \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-HIP-DEV-NEG
// CHECK-HIP-DEV-NEG-NOT: #define __CUDA_ARCH__
// CHECK-HIP-DEV-NEG-NOT: #define __CLANG_RDC__ 1
// RUN: %clang_cc1 %s -E -dM -o - -x cuda -triple x86_64-unknown-linux-gnu \
// RUN: -fgpu-rdc | FileCheck %s --check-prefix=CHECK-RDC
// RUN: %clang_cc1 %s -E -dM -o - -x cuda -triple nvptx \
// RUN: -fgpu-rdc -fcuda-is-device \
// RUN: | FileCheck %s --check-prefix=CHECK-RDC
// RUN: %clang_cc1 %s -E -dM -o - -x hip -triple x86_64-unknown-linux-gnu \
// RUN: -fgpu-rdc | FileCheck %s --check-prefix=CHECK-RDC
// RUN: %clang_cc1 %s -E -dM -o - -x hip -triple amdgcn-amd-amdhsa \
// RUN: -fgpu-rdc -fcuda-is-device \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-RDC
// CHECK-RDC: #define __CLANG_RDC__ 1