Author: Mark Danial Date: 2023-02-21T16:34:26-05:00 New Revision: 1360bfb05b3153ad93a7e866f0ac6860d94337a2
URL: https://github.com/llvm/llvm-project/commit/1360bfb05b3153ad93a7e866f0ac6860d94337a2 DIFF: https://github.com/llvm/llvm-project/commit/1360bfb05b3153ad93a7e866f0ac6860d94337a2.diff LOG: [Flang] Add user option -funderscoring/-fnounderscoring to control trailing underscore added to external names This patch adds user option -funderscoring/-fnounderscoring to control the trailing underscore being appended to external names (e.g. procedure names, common block names). The option in gfortran is documented in https://gcc.gnu.org/onlinedocs/gfortran/Code-Gen-Options.html. Reviewed By: clementval Differential Revision: https://reviews.llvm.org/D140795 Added: flang/test/Driver/underscoring.f90 Modified: clang/include/clang/Driver/Options.td clang/lib/Driver/ToolChains/Flang.cpp flang/include/flang/Frontend/CodeGenOptions.def flang/include/flang/Optimizer/Transforms/Passes.h flang/include/flang/Optimizer/Transforms/Passes.td flang/include/flang/Tools/CLOptions.inc flang/lib/Frontend/CompilerInvocation.cpp flang/lib/Frontend/FrontendActions.cpp flang/lib/Optimizer/Transforms/ExternalNameConversion.cpp flang/test/Driver/driver-help-hidden.f90 flang/test/Driver/driver-help.f90 flang/test/Fir/external-mangling.fir Removed: ################################################################################ diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index f84522c741561..a26af0af2c946 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -5028,7 +5028,6 @@ defm recursive : BooleanFFlag<"recursive">, Group<gfortran_Group>; defm repack_arrays : BooleanFFlag<"repack-arrays">, Group<gfortran_Group>; defm second_underscore : BooleanFFlag<"second-underscore">, Group<gfortran_Group>; defm sign_zero : BooleanFFlag<"sign-zero">, Group<gfortran_Group>; -defm underscoring : BooleanFFlag<"underscoring">, Group<gfortran_Group>; defm whole_file : BooleanFFlag<"whole-file">, Group<gfortran_Group>; // C++ SYCL options @@ -5103,6 +5102,7 @@ defm backslash : OptInFC1FFlag<"backslash", "Specify that backslash in string in defm xor_operator : OptInFC1FFlag<"xor-operator", "Enable .XOR. as a synonym of .NEQV.">; defm logical_abbreviations : OptInFC1FFlag<"logical-abbreviations", "Enable logical abbreviations">; defm implicit_none : OptInFC1FFlag<"implicit-none", "No implicit typing allowed unless overridden by IMPLICIT statements">; +defm underscoring : OptInFC1FFlag<"underscoring", "Appends one trailing underscore to external names">; def fno_automatic : Flag<["-"], "fno-automatic">, Group<f_Group>, HelpText<"Implies the SAVE attribute for non-automatic local objects in subprograms unless RECURSIVE">; diff --git a/clang/lib/Driver/ToolChains/Flang.cpp b/clang/lib/Driver/ToolChains/Flang.cpp index 8d9fae58ce50e..cd3907c099481 100644 --- a/clang/lib/Driver/ToolChains/Flang.cpp +++ b/clang/lib/Driver/ToolChains/Flang.cpp @@ -56,7 +56,8 @@ void Flang::addOtherOptions(const ArgList &Args, ArgStringList &CmdArgs) const { {options::OPT_module_dir, options::OPT_fdebug_module_writer, options::OPT_fintrinsic_modules_path, options::OPT_pedantic, options::OPT_std_EQ, options::OPT_W_Joined, - options::OPT_fconvert_EQ, options::OPT_fpass_plugin_EQ}); + options::OPT_fconvert_EQ, options::OPT_fpass_plugin_EQ, + options::OPT_funderscoring, options::OPT_fno_underscoring}); Arg *stackArrays = Args.getLastArg(options::OPT_Ofast, options::OPT_fstack_arrays, diff --git a/flang/include/flang/Frontend/CodeGenOptions.def b/flang/include/flang/Frontend/CodeGenOptions.def index 0de2360fd95be..7f50442af6d09 100644 --- a/flang/include/flang/Frontend/CodeGenOptions.def +++ b/flang/include/flang/Frontend/CodeGenOptions.def @@ -28,6 +28,7 @@ CODEGENOPT(PICLevel, 2, 0) ///< PIC level of the LLVM module. CODEGENOPT(IsPIE, 1, 0) ///< PIE level is the same as PIC Level. CODEGENOPT(StackArrays, 1, 0) ///< -fstack-arrays (enable the stack-arrays pass) +CODEGENOPT(Underscoring, 1, 1) ENUM_CODEGENOPT(RelocationModel, llvm::Reloc::Model, 3, llvm::Reloc::PIC_) ///< Name of the relocation model to use. #undef CODEGENOPT diff --git a/flang/include/flang/Optimizer/Transforms/Passes.h b/flang/include/flang/Optimizer/Transforms/Passes.h index efe55cecce30b..55f000f067b52 100644 --- a/flang/include/flang/Optimizer/Transforms/Passes.h +++ b/flang/include/flang/Optimizer/Transforms/Passes.h @@ -52,6 +52,8 @@ createArrayValueCopyPass(fir::ArrayValueCopyOptions options = {}); std::unique_ptr<mlir::Pass> createFirToCfgPass(); std::unique_ptr<mlir::Pass> createCharacterConversionPass(); std::unique_ptr<mlir::Pass> createExternalNameConversionPass(); +std::unique_ptr<mlir::Pass> +createExternalNameConversionPass(bool appendUnderscore); std::unique_ptr<mlir::Pass> createMemDataFlowOptPass(); std::unique_ptr<mlir::Pass> createPromoteToAffinePass(); std::unique_ptr<mlir::Pass> createMemoryAllocationPass(); diff --git a/flang/include/flang/Optimizer/Transforms/Passes.td b/flang/include/flang/Optimizer/Transforms/Passes.td index 13a73667965e5..dcec17f622f65 100644 --- a/flang/include/flang/Optimizer/Transforms/Passes.td +++ b/flang/include/flang/Optimizer/Transforms/Passes.td @@ -169,6 +169,11 @@ def ExternalNameConversion : Pass<"external-name-interop", "mlir::ModuleOp"> { Demangle FIR internal name and mangle them for external interoperability. }]; let constructor = "::fir::createExternalNameConversionPass()"; + let options = [ + Option<"appendUnderscore", "append-underscore", + "bool", /*default=*/"true", + "Append trailing underscore to external names."> + ]; } def MemRefDataFlowOpt : Pass<"fir-memref-dataflow-opt", "::mlir::func::FuncOp"> { diff --git a/flang/include/flang/Tools/CLOptions.inc b/flang/include/flang/Tools/CLOptions.inc index c61ff61fa5cfc..1015b9f86dc7f 100644 --- a/flang/include/flang/Tools/CLOptions.inc +++ b/flang/include/flang/Tools/CLOptions.inc @@ -157,9 +157,11 @@ inline void addBoxedProcedurePass(mlir::PassManager &pm) { } #endif -inline void addExternalNameConversionPass(mlir::PassManager &pm) { - addPassConditionally(pm, disableExternalNameConversion, - [&]() { return fir::createExternalNameConversionPass(); }); +inline void addExternalNameConversionPass( + mlir::PassManager &pm, bool appendUnderscore = true) { + addPassConditionally(pm, disableExternalNameConversion, [&]() { + return fir::createExternalNameConversionPass(appendUnderscore); + }); } /// Create a pass pipeline for running default optimization passes for @@ -207,8 +209,9 @@ inline void createDefaultFIROptimizerPassPipeline(mlir::PassManager &pm, } #if !defined(FLANG_EXCLUDE_CODEGEN) -inline void createDefaultFIRCodeGenPassPipeline( - mlir::PassManager &pm, llvm::OptimizationLevel optLevel = defaultOptLevel) { +inline void createDefaultFIRCodeGenPassPipeline(mlir::PassManager &pm, + llvm::OptimizationLevel optLevel = defaultOptLevel, + bool underscoring = true) { fir::addBoxedProcedurePass(pm); pm.addNestedPass<mlir::func::FuncOp>( fir::createAbstractResultOnFuncOptPass()); @@ -216,7 +219,7 @@ inline void createDefaultFIRCodeGenPassPipeline( fir::createAbstractResultOnGlobalOptPass()); fir::addCodeGenRewritePass(pm); fir::addTargetRewritePass(pm); - fir::addExternalNameConversionPass(pm); + fir::addExternalNameConversionPass(pm, underscoring); fir::addFIRToLLVMPass(pm, optLevel); } @@ -227,12 +230,12 @@ inline void createDefaultFIRCodeGenPassPipeline( /// passes pipeline inline void createMLIRToLLVMPassPipeline(mlir::PassManager &pm, llvm::OptimizationLevel optLevel = defaultOptLevel, - bool stackArrays = false) { + bool stackArrays = false, bool underscoring = true) { // Add default optimizer pass pipeline. fir::createDefaultFIROptimizerPassPipeline(pm, optLevel, stackArrays); // Add codegen pass pipeline. - fir::createDefaultFIRCodeGenPassPipeline(pm, optLevel); + fir::createDefaultFIRCodeGenPassPipeline(pm, optLevel, underscoring); } #undef FLANG_EXCLUDE_CODEGEN #endif diff --git a/flang/lib/Frontend/CompilerInvocation.cpp b/flang/lib/Frontend/CompilerInvocation.cpp index 08cb69d686fe1..9bccb7e37198a 100644 --- a/flang/lib/Frontend/CompilerInvocation.cpp +++ b/flang/lib/Frontend/CompilerInvocation.cpp @@ -171,6 +171,12 @@ static void parseCodeGenArgs(Fortran::frontend::CodeGenOptions &opts, if (args.hasArg(clang::driver::options::OPT_pic_is_pie)) opts.IsPIE = 1; } + + // This option is compatible with -f[no-]underscoring in gfortran. + if (args.hasFlag(clang::driver::options::OPT_fno_underscoring, + clang::driver::options::OPT_funderscoring, false)) { + opts.Underscoring = 0; + } } /// Parses all target input arguments and populates the target diff --git a/flang/lib/Frontend/FrontendActions.cpp b/flang/lib/Frontend/FrontendActions.cpp index eba5515c975fb..d2d3ab4cf1e35 100644 --- a/flang/lib/Frontend/FrontendActions.cpp +++ b/flang/lib/Frontend/FrontendActions.cpp @@ -545,7 +545,8 @@ void CodeGenAction::generateLLVMIR() { pm.enableVerifier(/*verifyPasses=*/true); // Create the pass pipeline - fir::createMLIRToLLVMPassPipeline(pm, level, opts.StackArrays); + fir::createMLIRToLLVMPassPipeline(pm, level, opts.StackArrays, + opts.Underscoring); mlir::applyPassManagerCLOptions(pm); // run the pass manager diff --git a/flang/lib/Optimizer/Transforms/ExternalNameConversion.cpp b/flang/lib/Optimizer/Transforms/ExternalNameConversion.cpp index 0d3df82fc5836..47b2b0f85d236 100644 --- a/flang/lib/Optimizer/Transforms/ExternalNameConversion.cpp +++ b/flang/lib/Optimizer/Transforms/ExternalNameConversion.cpp @@ -32,11 +32,16 @@ using namespace mlir; std::string mangleExternalName(const std::pair<fir::NameUniquer::NameKind, fir::NameUniquer::DeconstructedName> - result) { + result, + bool appendUnderscore) { if (result.first == fir::NameUniquer::NameKind::COMMON && result.second.name.empty()) return "__BLNK__"; - return result.second.name + "_"; + + if (appendUnderscore) + return result.second.name + "_"; + + return result.second.name; } //===----------------------------------------------------------------------===// @@ -49,6 +54,10 @@ struct MangleNameOnFuncOp : public mlir::OpRewritePattern<mlir::func::FuncOp> { public: using OpRewritePattern::OpRewritePattern; + MangleNameOnFuncOp(mlir::MLIRContext *ctx, bool appendUnderscore) + : mlir::OpRewritePattern<mlir::func::FuncOp>(ctx), + appendUnderscore(appendUnderscore) {} + mlir::LogicalResult matchAndRewrite(mlir::func::FuncOp op, mlir::PatternRewriter &rewriter) const override { @@ -56,7 +65,8 @@ struct MangleNameOnFuncOp : public mlir::OpRewritePattern<mlir::func::FuncOp> { rewriter.startRootUpdate(op); auto result = fir::NameUniquer::deconstruct(op.getSymName()); if (fir::NameUniquer::isExternalFacingUniquedName(result)) { - auto newSymbol = rewriter.getStringAttr(mangleExternalName(result)); + auto newSymbol = + rewriter.getStringAttr(mangleExternalName(result, appendUnderscore)); // Try to update all SymbolRef's in the module that match the current op if (mlir::ModuleOp mod = op->getParentOfType<mlir::ModuleOp>()) @@ -69,12 +79,19 @@ struct MangleNameOnFuncOp : public mlir::OpRewritePattern<mlir::func::FuncOp> { rewriter.finalizeRootUpdate(op); return ret; } + +private: + bool appendUnderscore; }; struct MangleNameForCommonBlock : public mlir::OpRewritePattern<fir::GlobalOp> { public: using OpRewritePattern::OpRewritePattern; + MangleNameForCommonBlock(mlir::MLIRContext *ctx, bool appendUnderscore) + : mlir::OpRewritePattern<fir::GlobalOp>(ctx), + appendUnderscore(appendUnderscore) {} + mlir::LogicalResult matchAndRewrite(fir::GlobalOp op, mlir::PatternRewriter &rewriter) const override { @@ -82,39 +99,57 @@ struct MangleNameForCommonBlock : public mlir::OpRewritePattern<fir::GlobalOp> { auto result = fir::NameUniquer::deconstruct( op.getSymref().getRootReference().getValue()); if (fir::NameUniquer::isExternalFacingUniquedName(result)) { - auto newName = mangleExternalName(result); + auto newName = mangleExternalName(result, appendUnderscore); op.setSymrefAttr(mlir::SymbolRefAttr::get(op.getContext(), newName)); SymbolTable::setSymbolName(op, newName); } rewriter.finalizeRootUpdate(op); return success(); } + +private: + bool appendUnderscore; }; struct MangleNameOnAddrOfOp : public mlir::OpRewritePattern<fir::AddrOfOp> { public: using OpRewritePattern::OpRewritePattern; + MangleNameOnAddrOfOp(mlir::MLIRContext *ctx, bool appendUnderscore) + : mlir::OpRewritePattern<fir::AddrOfOp>(ctx), + appendUnderscore(appendUnderscore) {} + mlir::LogicalResult matchAndRewrite(fir::AddrOfOp op, mlir::PatternRewriter &rewriter) const override { auto result = fir::NameUniquer::deconstruct( op.getSymbol().getRootReference().getValue()); if (fir::NameUniquer::isExternalFacingUniquedName(result)) { - auto newName = - SymbolRefAttr::get(op.getContext(), mangleExternalName(result)); + auto newName = SymbolRefAttr::get( + op.getContext(), mangleExternalName(result, appendUnderscore)); rewriter.replaceOpWithNewOp<fir::AddrOfOp>(op, op.getResTy().getType(), newName); } return success(); } + +private: + bool appendUnderscore; }; class ExternalNameConversionPass : public fir::impl::ExternalNameConversionBase<ExternalNameConversionPass> { public: + ExternalNameConversionPass(bool appendUnderscoring) + : appendUnderscores(appendUnderscoring) {} + + ExternalNameConversionPass() { appendUnderscores = appendUnderscore; } + mlir::ModuleOp getModule() { return getOperation(); } void runOnOperation() override; + +private: + bool appendUnderscores; }; } // namespace @@ -124,7 +159,7 @@ void ExternalNameConversionPass::runOnOperation() { mlir::RewritePatternSet patterns(context); patterns.insert<MangleNameOnFuncOp, MangleNameForCommonBlock, - MangleNameOnAddrOfOp>(context); + MangleNameOnAddrOfOp>(context, appendUnderscore); ConversionTarget target(*context); target.addLegalDialect<fir::FIROpsDialect, LLVM::LLVMDialect, @@ -151,3 +186,8 @@ void ExternalNameConversionPass::runOnOperation() { std::unique_ptr<mlir::Pass> fir::createExternalNameConversionPass() { return std::make_unique<ExternalNameConversionPass>(); } + +std::unique_ptr<mlir::Pass> +fir::createExternalNameConversionPass(bool appendUnderscoring) { + return std::make_unique<ExternalNameConversionPass>(appendUnderscoring); +} diff --git a/flang/test/Driver/driver-help-hidden.f90 b/flang/test/Driver/driver-help-hidden.f90 index a19919758b62f..18666ae2c6214 100644 --- a/flang/test/Driver/driver-help-hidden.f90 +++ b/flang/test/Driver/driver-help-hidden.f90 @@ -54,6 +54,7 @@ ! CHECK-NEXT: -freciprocal-math Allow division operations to be reassociated ! CHECK-NEXT: -fstack-arrays Attempt to allocate array temporaries on the stack, no matter their size ! CHECK-NEXT: -fsyntax-only Run the preprocessor, parser and semantic analysis stages +! CHECK-NEXT: -funderscoring Appends one trailing underscore to external names ! CHECK-NEXT: -fxor-operator Enable .XOR. as a synonym of .NEQV. ! CHECK-NEXT: -help Display available options ! CHECK-NEXT: -I <dir> Add directory to the end of the list of include search paths diff --git a/flang/test/Driver/driver-help.f90 b/flang/test/Driver/driver-help.f90 index 42c7d4d8cdb28..7fdce71190f61 100644 --- a/flang/test/Driver/driver-help.f90 +++ b/flang/test/Driver/driver-help.f90 @@ -52,6 +52,7 @@ ! HELP-NEXT: -freciprocal-math Allow division operations to be reassociated ! HELP-NEXT: -fstack-arrays Attempt to allocate array temporaries on the stack, no matter their size ! HELP-NEXT: -fsyntax-only Run the preprocessor, parser and semantic analysis stages +! HELP-NEXT: -funderscoring Appends one trailing underscore to external names ! HELP-NEXT: -fxor-operator Enable .XOR. as a synonym of .NEQV. ! HELP-NEXT: -help Display available options ! HELP-NEXT: -I <dir> Add directory to the end of the list of include search paths @@ -142,6 +143,7 @@ ! HELP-FC1-NEXT: -freciprocal-math Allow division operations to be reassociated ! HELP-FC1-NEXT: -fstack-arrays Attempt to allocate array temporaries on the stack, no matter their size ! HELP-FC1-NEXT: -fsyntax-only Run the preprocessor, parser and semantic analysis stages +! HELP-FC1-NEXT: -funderscoring Appends one trailing underscore to external names ! HELP-FC1-NEXT: -fxor-operator Enable .XOR. as a synonym of .NEQV. ! HELP-FC1-NEXT: -help Display available options ! HELP-FC1-NEXT: -init-only Only execute frontend initialization diff --git a/flang/test/Driver/underscoring.f90 b/flang/test/Driver/underscoring.f90 new file mode 100644 index 0000000000000..a19b193df39fe --- /dev/null +++ b/flang/test/Driver/underscoring.f90 @@ -0,0 +1,24 @@ +! Test the -funderscoring flag + +! RUN: %flang_fc1 -S %s -o - 2>&1 | FileCheck %s --check-prefix=UNDERSCORING +! RUN: %flang_fc1 -S -fno-underscoring %s -o - 2>&1 | FileCheck %s --check-prefix=NO-UNDERSCORING + +subroutine test() + common /comblk/ a, b + external :: ext_sub + call ext_sub() +end + +! UNDERSCORING: test_ +! UNDERSCORING: ext_sub_ +! UNDERSCORING: comblk_ + +! NO-UNDERSCORING-NOT: test_ +! NO-UNDERSCORING-NOT: _QPtest +! NO-UNDERSCORING: test +! NO-UNDERSCORING-NOT: ext_sub_ +! NO-UNDERSCORING-NOT: _QPext_sub +! NO-UNDERSCORING: ext_sub +! NO-UNDERSCORING-NOT: comblk_ +! NO-UNDERSCORING-NOT: _QBcomblk +! NO-UNDERSCORING: comblk diff --git a/flang/test/Fir/external-mangling.fir b/flang/test/Fir/external-mangling.fir index ce728c1b706cf..3673cad583394 100644 --- a/flang/test/Fir/external-mangling.fir +++ b/flang/test/Fir/external-mangling.fir @@ -1,6 +1,9 @@ -// RUN: fir-opt --external-name-interop %s | FileCheck %s -// RUN: tco --external-name-interop %s | FileCheck %s -// RUN: tco --external-name-interop %s | tco --fir-to-llvm-ir | FileCheck %s --check-prefix=LLVMIR +// RUN: fir-opt --external-name-interop="append-underscore=true" %s | FileCheck %s --check-prefix=CHECK-UNDER +// RUN: fir-opt --external-name-interop="append-underscore=false" %s | FileCheck %s --check-prefix=CHECK-NOUNDER +// RUN: tco --external-name-interop="append-underscore=true" %s | FileCheck %s --check-prefix=CHECK-UNDER +// RUN: tco --external-name-interop="append-underscore=false" %s | FileCheck %s --check-prefix=CHECK-NOUNDER +// RUN: tco --external-name-interop="append-underscore=true" %s | tco --fir-to-llvm-ir | FileCheck %s --check-prefix=LLVMIR-UNDER +// RUN: tco --external-name-interop="append-underscore=false" %s | tco --fir-to-llvm-ir | FileCheck %s --check-prefix=LLVMIR-NOUNDER func.func @_QPfoo() { %c0 = arith.constant 0 : index @@ -21,24 +24,43 @@ fir.global common @_QB(dense<0> : vector<4xi8>) : !fir.array<4xi8> func.func private @_QPbar(!fir.ref<i32>) func.func private @_QPbar2(!fir.ref<f32>) -// CHECK: func @foo_ -// CHECK: %{{.*}} = fir.address_of(@a_) : !fir.ref<!fir.array<4xi8>> -// CHECK: %{{.*}} = fir.address_of(@__BLNK__) : !fir.ref<!fir.array<4xi8>> -// CHECK: fir.call @bar_ -// CHECK: fir.call @bar2_ -// CHECK: fir.global common @a_(dense<0> : vector<4xi8>) : !fir.array<4xi8> -// CHECK: fir.global common @__BLNK__(dense<0> : vector<4xi8>) : !fir.array<4xi8> -// CHECK: func private @bar_(!fir.ref<i32>) - -// LLVMIR: %{{.*}} = llvm.mlir.addressof @a_ : !llvm.ptr<array<4 x i8>> -// LLVMIR: %{{.*}} = llvm.mlir.addressof @__BLNK__ : !llvm.ptr<array<4 x i8>> -// LLVMIR: llvm.call @bar_(%{{.*}}) : (!llvm.ptr<i32>) -> () -// LLVMIR: llvm.call @bar2_(%{{.*}}) : (!llvm.ptr<f32>) -> () - -// LLVMIR: llvm.mlir.global common @a_(dense<0> : vector<4xi8>) {{.*}} : !llvm.array<4 x i8> -// LLVMIR: llvm.mlir.global common @__BLNK__(dense<0> : vector<4xi8>) {{.*}} : !llvm.array<4 x i8> -// LLVMIR: llvm.func @bar_(!llvm.ptr<i32>) attributes {sym_visibility = "private"} -// LLVMIR: llvm.func @bar2_(!llvm.ptr<f32>) attributes {sym_visibility = "private"} +// CHECK-UNDER: func @foo_ +// CHECK-UNDER: %{{.*}} = fir.address_of(@a_) : !fir.ref<!fir.array<4xi8>> +// CHECK-UNDER: %{{.*}} = fir.address_of(@__BLNK__) : !fir.ref<!fir.array<4xi8>> +// CHECK-UNDER: fir.call @bar_ +// CHECK-UNDER: fir.call @bar2_ +// CHECK-UNDER: fir.global common @a_(dense<0> : vector<4xi8>) : !fir.array<4xi8> +// CHECK-UNDER: fir.global common @__BLNK__(dense<0> : vector<4xi8>) : !fir.array<4xi8> +// CHECK-UNDER: func private @bar_(!fir.ref<i32>) + +// CHECK-NOUNDER: func @foo( +// CHECK-NOUNDER: %{{.*}} = fir.address_of(@a) : !fir.ref<!fir.array<4xi8>> +// CHECK-NOUNDER: %{{.*}} = fir.address_of(@__BLNK__) : !fir.ref<!fir.array<4xi8>> +// CHECK-NOUNDER: fir.call @bar( +// CHECK-NOUNDER: fir.call @bar2( +// CHECK-NOUNDER: fir.global common @a(dense<0> : vector<4xi8>) : !fir.array<4xi8> +// CHECK-NOUNDER: fir.global common @__BLNK__(dense<0> : vector<4xi8>) : !fir.array<4xi8> +// CHECK-NOUNDER: func private @bar(!fir.ref<i32>) + +// LLVMIR-UNDER: %{{.*}} = llvm.mlir.addressof @a_ : !llvm.ptr<array<4 x i8>> +// LLVMIR-UNDER: %{{.*}} = llvm.mlir.addressof @__BLNK__ : !llvm.ptr<array<4 x i8>> +// LLVMIR-UNDER: llvm.call @bar_(%{{.*}}) : (!llvm.ptr<i32>) -> () +// LLVMIR-UNDER: llvm.call @bar2_(%{{.*}}) : (!llvm.ptr<f32>) -> () + +// LLVMIR-UNDER: llvm.mlir.global common @a_(dense<0> : vector<4xi8>) {{.*}} : !llvm.array<4 x i8> +// LLVMIR-UNDER: llvm.mlir.global common @__BLNK__(dense<0> : vector<4xi8>) {{.*}} : !llvm.array<4 x i8> +// LLVMIR-UNDER: llvm.func @bar_(!llvm.ptr<i32>) attributes {sym_visibility = "private"} +// LLVMIR-UNDER: llvm.func @bar2_(!llvm.ptr<f32>) attributes {sym_visibility = "private"} + +// LLVMIR-NOUNDER: %{{.*}} = llvm.mlir.addressof @a : !llvm.ptr<array<4 x i8>> +// LLVMIR-NOUNDER: %{{.*}} = llvm.mlir.addressof @__BLNK__ : !llvm.ptr<array<4 x i8>> +// LLVMIR-NOUNDER: llvm.call @bar(%{{.*}}) : (!llvm.ptr<i32>) -> () +// LLVMIR-NOUNDER: llvm.call @bar2(%{{.*}}) : (!llvm.ptr<f32>) -> () + +// LLVMIR-NOUNDER: llvm.mlir.global common @a(dense<0> : vector<4xi8>) {{.*}} : !llvm.array<4 x i8> +// LLVMIR-NOUNDER: llvm.mlir.global common @__BLNK__(dense<0> : vector<4xi8>) {{.*}} : !llvm.array<4 x i8> +// LLVMIR-NOUNDER: llvm.func @bar(!llvm.ptr<i32>) attributes {sym_visibility = "private"} +// LLVMIR-NOUNDER: llvm.func @bar2(!llvm.ptr<f32>) attributes {sym_visibility = "private"} // ----- @@ -52,10 +74,18 @@ func.func @_QPcaller() { return } -// CHECK: func @callee_ -// CHECK: fir.call @callee_ -// CHECK: func @caller_ -// CHECK: fir.call @callee_ +// CHECK-UNDER: func @callee_ +// CHECK-UNDER: fir.call @callee_ +// CHECK-UNDER: func @caller_ +// CHECK-UNDER: fir.call @callee_ + +// LLVMIR-UNDER: llvm.call @callee_() : () -> () +// LLVMIR-UNDER: llvm.call @callee_() : () -> () + +// CHECK-NOUNDER: func @callee( +// CHECK-NOUNDER: fir.call @callee( +// CHECK-NOUNDER: func @caller( +// CHECK-NOUNDER: fir.call @callee( -// LLVMIR: llvm.call @callee_() : () -> () -// LLVMIR: llvm.call @callee_() : () -> () +// LLVMIR-NOUNDER: llvm.call @callee() : () -> () +// LLVMIR-NOUNDER: llvm.call @callee() : () -> () _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
