[MLIR][LLVM] LLVM import should use is isDSOLocal instead of hasLocalLinkage to set dso_local attribute

[ghehg]

Without this change, function definitions that mostly have external linkage would be missing dso_local attribute during translation.

[github-actions]

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

[llvmbot]

@llvm/pr-subscribers-mlir

@llvm/pr-subscribers-mlir-llvm

Author: Guojin (ghehg)

Changes

Function definitions mostly have external linkage thus would be missing dso_local attribute during translation.

---

Full diff: https://github.com/llvm/llvm-project/pull/124822.diff

2 Files Affected:

• (modified) mlir/lib/Target/LLVMIR/ModuleImport.cpp (+1-1)
• (modified) mlir/test/Target/LLVMIR/Import/function-attributes-generic.ll (+10)

diff --git a/mlir/lib/Target/LLVMIR/ModuleImport.cpp b/mlir/lib/Target/LLVMIR/ModuleImport.cpp
index 40d86efe605ad0..414e000356c51f 100644
--- a/mlir/lib/Target/LLVMIR/ModuleImport.cpp
+++ b/mlir/lib/Target/LLVMIR/ModuleImport.cpp
@@ -2106,7 +2106,7 @@ LogicalResult ModuleImport::processFunction(llvm::Function *func) {
       iface.isConvertibleIntrinsic(func->getIntrinsicID()))
     return success();
 
-  bool dsoLocal = func->hasLocalLinkage();
+  bool dsoLocal = func->isDSOLocal();
   CConv cconv = convertCConvFromLLVM(func->getCallingConv());
 
   // Insert the function at the end of the module.
diff --git a/mlir/test/Target/LLVMIR/Import/function-attributes-generic.ll b/mlir/test/Target/LLVMIR/Import/function-attributes-generic.ll
index d7f8400413b896..a3cf048441e0d5 100644
--- a/mlir/test/Target/LLVMIR/Import/function-attributes-generic.ll
+++ b/mlir/test/Target/LLVMIR/Import/function-attributes-generic.ll
@@ -7,3 +7,13 @@
 ; CHECK-NOT:  res_attrs
 ; CHECK-SAME:  }>
 declare ptr @func_no_param_attrs()
+
+; Ensure that we have dso_local
+; CHECK: "llvm.func"()
+; CHECK-SAME: <{
+; CHECK-SAME: dso_local
+; CHECK-SAME: "dsolocal_func"
+; CHECK-SAME:  }>
+define dso_local void @dsolocal_func() {
+  ret void
+}

[gysit]

Thanks for the fix!

[gysit]

Was there a specific reason to test this using the generic rather than the pretty printed format?

I would prefer to move the test to function-attributes.ll where the other attributes are tested.

[ghehg]

Thanks for quick review. Just moved the test.
No, no specific reason other than I thought making size of function-attributes-generics and function-attributes.ll balanced would be good.

[gysit]

Thanks for moving the test! There is one small issue left.

It looks like you do not have commit rights? Should I land the commit for you once the issue is fixed?

[Dinistro]

Nit: Can you move this into a separate split, i.e., can you add ; // ----- above the function?

[ghehg]

sure. just made its own split

[ghehg]

Thanks for moving the test! There is one small issue left.

It looks like you do not have commit rights? Should I land the commit for you once the issue is fixed?

Yeah, I'm new to llvm main, so would appreciate it if you could help to land once all reviewers satisfied.

[github-actions]

@ghehg Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!