Cold-Air-Networks/mirror-llvm-project
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 7

[flang][cuda] Decouple CUFInit from CUDA language features (#209846)

Browse source 
In some cases, we do not want to emit the CUFInit function in the main.
Add a specific language feature for it so we can decouple it.
This commit is contained in:
Valentin Clement (バレンタイン クレメン) 2026-07-15 14:41:58 -07:00 committed by GitHub
parent 1ffd509c4b
commit c63bfe581c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flang/include/flang/Support/Fortran-features.h
View file

@ -61,7 +61,7 @@ ENUM_CLASS(LanguageFeature, BackslashEscapes, OldDebugLines,
MultipleProgramUnitsOnSameLine, AllocatedForAssociated,
OpenMPThreadprivateEquivalence, RelaxedCLocChecks, CudaPinned,
OpenAccDefaultNoneScalarsStrict, OpenACCMultipleNamesInRoutine,
EnumerationType)
EnumerationType, CUDAInit)
// Portability and suspicious usage warnings
ENUM_CLASS(UsageWarning, Portability, PointerToUndefinable,

6
flang/lib/Lower/Bridge.cpp
View file

@ -618,8 +618,10 @@ public:
createBuilderOutsideOfFuncOpAndDo([&]() {
fir::runtime::genMain(*builder, toLocation(),
bridge.getEnvironmentDefaults(),
getFoldingContext().languageFeatures().IsEnabled(
Fortran::common::LanguageFeature::CUDA),
(getFoldingContext().languageFeatures().IsEnabled(
Fortran::common::LanguageFeature::CUDA) &&
getFoldingContext().languageFeatures().IsEnabled(
Fortran::common::LanguageFeature::CUDAInit)),
getFoldingContext().languageFeatures().IsEnabled(
Fortran::common::LanguageFeature::Coarray));
});

1
flang/lib/Support/Fortran-features.cpp
View file

@ -135,6 +135,7 @@ LanguageFeatureControl::LanguageFeatureControl() {
disable_.set(LanguageFeature::CudaManaged);
disable_.set(LanguageFeature::CudaUnified);
disable_.set(LanguageFeature::CudaPinned);
disable_.set(LanguageFeature::CUDAInit);
disable_.set(LanguageFeature::ImplicitNoneTypeNever);
disable_.set(LanguageFeature::ImplicitNoneTypeAlways);
disable_.set(LanguageFeature::ImplicitNoneExternal);

3
flang/test/Lower/CUDA/cuda-init.cuf
View file

@ -1,4 +1,5 @@
! RUN: bbc -emit-fir -fcuda %s -o - | FileCheck %s --check-prefixes=ALL,CUDA
! RUN: bbc -emit-fir -fcuda -fcuda-init %s -o - | FileCheck %s --check-prefixes=ALL,CUDA
! RUN: bbc -emit-fir -fcuda %s -o - | FileCheck %s --check-prefixes=ALL,NOCUDA
! RUN: bbc -emit-fir %s -o - | FileCheck %s --check-prefixes=ALL,NOCUDA
program test_init

7
flang/tools/bbc/bbc.cpp
View file

@ -230,6 +230,10 @@ static llvm::cl::opt<bool> enableCUDA("fcuda",
llvm::cl::desc("enable CUDA Fortran"),
llvm::cl::init(false));
static llvm::cl::opt<bool> enableCUDAInit("fcuda-init",
llvm::cl::desc("enable CUDA Init"),
llvm::cl::init(false));
static llvm::cl::opt<bool>
enableDoConcurrentOffload("fdoconcurrent-offload",
llvm::cl::desc("enable do concurrent offload"),
@ -685,6 +689,9 @@ int main(int argc, char **argv) {
if (enableCUDA) {
options.features.Enable(Fortran::common::LanguageFeature::CUDA);
}
if (enableCUDAInit) {
options.features.Enable(Fortran::common::LanguageFeature::CUDAInit);
}
if (enableDoConcurrentOffload) {
options.features.Enable(