From 9ef73f2f58ecfce21bdeb27f68b224d9be97cfe6 Mon Sep 17 00:00:00 2001 From: Mehdi Amini Date: Mon, 19 Jun 2023 11:58:49 +0200 Subject: [PATCH] Emit MLIR trampoline wrapper function with LLVM private linkage The wrapper, as most of compiler-generated functions, are intended to serve the IR for the current module. The safest linkage is to keep these private to avoid any possible collision with other modules. Differential Revision: https://reviews.llvm.org/D153255 --- mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp | 2 ++ .../emit-c-wrappers-for-external-functions.mlir | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp b/mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp index 5867d9f..3ae997d 100644 --- a/mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp +++ b/mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp @@ -208,6 +208,8 @@ static void wrapExternalFunction(OpBuilder &builder, Location loc, wrapperType, LLVM::Linkage::External, /*dsoLocal*/ false, /*cconv*/ LLVM::CConv::C, attributes); + // The wrapper that we synthetize here should only be visible in this module. + newFuncOp.setLinkage(LLVM::Linkage::Private); builder.setInsertionPointToStart(newFuncOp.addEntryBlock()); // Get a ValueRange containing arguments. diff --git a/mlir/test/Conversion/FuncToLLVM/emit-c-wrappers-for-external-functions.mlir b/mlir/test/Conversion/FuncToLLVM/emit-c-wrappers-for-external-functions.mlir index 3e88411..027d29b 100644 --- a/mlir/test/Conversion/FuncToLLVM/emit-c-wrappers-for-external-functions.mlir +++ b/mlir/test/Conversion/FuncToLLVM/emit-c-wrappers-for-external-functions.mlir @@ -1,38 +1,38 @@ // RUN: mlir-opt -llvm-request-c-wrappers -convert-func-to-llvm='use-opaque-pointers=1' %s | FileCheck %s -// CHECK: llvm.func @res_attrs_with_memref_return() -> (!llvm.struct{{.*}} {test.returnOne}) +// CHECK: llvm.func private @res_attrs_with_memref_return() -> (!llvm.struct{{.*}} {test.returnOne}) // CHECK-LABEL: llvm.func @_mlir_ciface_res_attrs_with_memref_return // CHECK-SAME: !llvm.ptr // CHECK-NOT: test.returnOne func.func private @res_attrs_with_memref_return() -> (memref {test.returnOne}) -// CHECK: llvm.func @res_attrs_with_value_return() -> (f32 {test.returnOne = 1 : i64}) +// CHECK: llvm.func private @res_attrs_with_value_return() -> (f32 {test.returnOne = 1 : i64}) // CHECK-LABEL: llvm.func @_mlir_ciface_res_attrs_with_value_return // CHECK-SAME: -> (f32 {test.returnOne = 1 : i64}) func.func private @res_attrs_with_value_return() -> (f32 {test.returnOne = 1}) -// CHECK: llvm.func @multiple_return() -> !llvm.struct<{{.*}}> +// CHECK: llvm.func private @multiple_return() -> !llvm.struct<{{.*}}> // CHECK-LABEL: llvm.func @_mlir_ciface_multiple_return // CHECK-NOT: test.returnOne // CHECK-NOT: test.returnTwo // CHECK-NOT: test.returnThree func.func private @multiple_return() -> (memref {test.returnOne = 1}, f32 {test.returnTwo = 2, test.returnThree = 3}) -// CHECK: llvm.func @multiple_return_missing_res_attr() -> !llvm.struct<{{.*}}> +// CHECK: llvm.func private @multiple_return_missing_res_attr() -> !llvm.struct<{{.*}}> // CHECK-LABEL: llvm.func @_mlir_ciface_multiple_return_missing_res_attr // CHECK-NOT: test.returnOne // CHECK-NOT: test.returnTwo // CHECK-NOT: test.returnThree func.func private @multiple_return_missing_res_attr() -> (memref {test.returnOne = 1}, i64, f32 {test.returnTwo = 2, test.returnThree = 3}) -// CHECK: llvm.func @one_arg_attr_no_res_attrs_with_memref_return({{.*}}) -> !llvm.struct{{.*}} +// CHECK: llvm.func private @one_arg_attr_no_res_attrs_with_memref_return({{.*}}) -> !llvm.struct{{.*}} // CHECK-LABEL: llvm.func @_mlir_ciface_one_arg_attr_no_res_attrs_with_memref_return // CHECK-SAME: !llvm.ptr // CHECK-SAME: !llvm.ptr // CHECK-SAME: {test.argOne = 1 : i64}) func.func private @one_arg_attr_no_res_attrs_with_memref_return(%arg0: memref {test.argOne = 1}) -> memref -// CHECK: llvm.func @one_arg_attr_one_res_attr_with_memref_return({{.*}}) -> (!llvm.struct<{{.*}}> {test.returnOne = 1 : i64}) +// CHECK: llvm.func private @one_arg_attr_one_res_attr_with_memref_return({{.*}}) -> (!llvm.struct<{{.*}}> {test.returnOne = 1 : i64}) // CHECK-LABEL: llvm.func @_mlir_ciface_one_arg_attr_one_res_attr_with_memref_return // CHECK-SAME: !llvm.ptr // CHECK-NOT: test.returnOne @@ -40,14 +40,14 @@ func.func private @one_arg_attr_no_res_attrs_with_memref_return(%arg0: memref {test.argOne = 1}) -> (memref {test.returnOne = 1}) -// CHECK: llvm.func @one_arg_attr_one_res_attr_with_value_return({{.*}}) -> (f32 {test.returnOne = 1 : i64}) +// CHECK: llvm.func private @one_arg_attr_one_res_attr_with_value_return({{.*}}) -> (f32 {test.returnOne = 1 : i64}) // CHECK-LABEL: llvm.func @_mlir_ciface_one_arg_attr_one_res_attr_with_value_return // CHECK-SAME: !llvm.ptr // CHECK-SAME: {test.argOne = 1 : i64} // CHECK-SAME: -> (f32 {test.returnOne = 1 : i64}) func.func private @one_arg_attr_one_res_attr_with_value_return(%arg0: memref {test.argOne = 1}) -> (f32 {test.returnOne = 1}) -// CHECK: llvm.func @multiple_arg_attr_multiple_res_attr({{.*}}) -> !llvm.struct<{{.*}}> +// CHECK: llvm.func private @multiple_arg_attr_multiple_res_attr({{.*}}) -> !llvm.struct<{{.*}}> // CHECK-LABEL: llvm.func @_mlir_ciface_multiple_arg_attr_multiple_res_attr // CHECK-SAME: !llvm.ptr // CHECK-NOT: test.returnOne @@ -58,7 +58,7 @@ func.func private @one_arg_attr_one_res_attr_with_value_return(%arg0: memref {test.argZero = 0}, %arg1: f32, %arg2: i32 {test.argTwo = 2}) -> (f32, memref {test.returnOne = 1}, i32 {test.returnTwo = 2}) -// CHECK: llvm.func weak @drop_linkage_attr() -> (!llvm.struct{{.*}} {test.returnOne}) +// CHECK: llvm.func private @drop_linkage_attr() -> (!llvm.struct{{.*}} {test.returnOne}) // CHECK-LABEL: llvm.func @_mlir_ciface_drop_linkage_attr // CHECK-SAME: !llvm.ptr // CHECK-NOT: llvm.linkage -- 2.7.4