Skip to content

[MLIR][ROCDL] Added SchedGroupBarrier and IglpOpt ops #112237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 15, 2024

Conversation

ravil-mobile
Copy link
Contributor

@ravil-mobile ravil-mobile commented Oct 14, 2024

This PR adds missing sched.group.barrier and rocdl.iglp.opt ops to the ROCDL dialect (see here). The ops are converted to the corresponding intrinsic calls during the translation from MLIR to LLVM IRs. This intrinsics are hints to the instruction scheduler of the AMDGPU backend.

Copy link

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
Copy link
Member

llvmbot commented Oct 14, 2024

@llvm/pr-subscribers-mlir-llvm

@llvm/pr-subscribers-mlir

Author: None (ravil-mobile)

Changes

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

1 Files Affected:

  • (modified) mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td (+18)
diff --git a/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td b/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
index b80d9ae88910c4..c40ae4b1016b49 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
@@ -297,6 +297,24 @@ def ROCDL_SchedBarrier : ROCDL_IntrOp<"sched.barrier", [], [], [], 0>,
     "createIntrinsicCall(builder, llvm::Intrinsic::amdgcn_sched_barrier,builder.getInt32(op.getMask()));";
 }
 
+def ROCDL_SchedGroupBarrier : ROCDL_IntrOp<"sched.group.barrier", [], [], [], 0>,
+  Arguments<(ins I32Attr:$mask, I32Attr:$size, I32Attr:$groupId)> {
+  let results = (outs);
+  let assemblyFormat = "$mask `,` $size `,` $groupId attr-dict";
+  string llvmBuilder = [{
+    createIntrinsicCall(builder,
+      llvm::Intrinsic::amdgcn_sched_group_barrier,
+      {builder.getInt32(op.getMask()), builder.getInt32(op.getSize()), builder.getInt32(op.getGroupId())});
+  }];
+}
+
+def ROCDL_IglpOpt : ROCDL_IntrOp<"iglp.opt", [], [], [], 0>,
+  Arguments<(ins I32Attr:$variant)> {
+  let results = (outs);
+  let assemblyFormat = "$variant attr-dict";
+  string llvmBuilder =
+    "createIntrinsicCall(builder, llvm::Intrinsic::amdgcn_iglp_opt,builder.getInt32(op.getVariant()));";
+}
 
 //===---------------------------------------------------------------------===//
 // Xdlops intrinsics

@giuseros
Copy link
Contributor

Hi @ravil-mobile , could you add the minimal tests as done for the other intrinsics?

@giuseros
Copy link
Contributor

Also, could you add a more descriptive message to this PR?

@manupak
Copy link
Contributor

manupak commented Oct 15, 2024

@ravil-mobile thanks for the PR! and intrinsic builders seems correct to me.
echoing @giuseros, we need tests + description (PR & commit).

@manupak
Copy link
Contributor

manupak commented Oct 15, 2024

cc: @arsenm

Copy link
Contributor

@arsenm arsenm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing tests

@ravil-mobile
Copy link
Contributor Author

ravil-mobile commented Oct 15, 2024

Hi @giuseros , @arsenm @manupak ,

Thanks for your comments. I've just added the tests. Can you have a look, please?

Currently, the ROCDL dialect contains only `rocdl.sched.barrier` op.
This commit adds missing `sched.group.barrier` and `rocdl.iglp.opt` ops.
The ops are converted to the corresponding intrinsic calls during
the translation from MLIR to LLVM IRs. This intrinsics are hints to
the instruction scheduler of the AMDGPU backend.
@giuseros
Copy link
Contributor

Let's wait for @arsenm's approval to merge

@giuseros giuseros merged commit d741435 into llvm:main Oct 15, 2024
8 checks passed
Copy link

@ravil-mobile 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!

DanielCChen pushed a commit to DanielCChen/llvm-project that referenced this pull request Oct 16, 2024
This PR adds missing `sched.group.barrier` and `rocdl.iglp.opt` ops to
the ROCDL dialect (see
[here](https://github.com/llvm/llvm-project/blob/ec78f0da0e9b1b8e2b2323e434ea742e272dd913/clang/include/clang/Basic/BuiltinsAMDGPU.def#L66-L68)).
The ops are converted to the corresponding intrinsic calls during the
translation from MLIR to LLVM IRs. This intrinsics are hints to the
instruction scheduler of the AMDGPU backend.
antiagainst pushed a commit to triton-lang/triton that referenced this pull request Oct 16, 2024
Upgrading LLVM to pick up the following changes for AMD backend:
* llvm/llvm-project#112237

Changes made:
- changed the signature of `visit` method in `ConstantAnalysis` - i.e.,
  accepts an instance of the `ProgramPoint`.
- updated calls to `getLatticeElementFor` -i.e., accepts an instance of
  the `ProgramPoint`.
- added the required last parameter to `LLVM::DISubprogramAttr::get` -
  i.e., an empty `annotations`.
Luosuu pushed a commit to Luosuu/triton that referenced this pull request Nov 13, 2024
Upgrading LLVM to pick up the following changes for AMD backend:
* llvm/llvm-project#112237

Changes made:
- changed the signature of `visit` method in `ConstantAnalysis` - i.e.,
  accepts an instance of the `ProgramPoint`.
- updated calls to `getLatticeElementFor` -i.e., accepts an instance of
  the `ProgramPoint`.
- added the required last parameter to `LLVM::DISubprogramAttr::get` -
  i.e., an empty `annotations`.
guacamoleo pushed a commit to guacamoleo/triton that referenced this pull request Nov 14, 2024
Upgrading LLVM to pick up the following changes for AMD backend:
* llvm/llvm-project#112237

Changes made:
- changed the signature of `visit` method in `ConstantAnalysis` - i.e.,
  accepts an instance of the `ProgramPoint`.
- updated calls to `getLatticeElementFor` -i.e., accepts an instance of
  the `ProgramPoint`.
- added the required last parameter to `LLVM::DISubprogramAttr::get` -
  i.e., an empty `annotations`.
bertmaher pushed a commit to bertmaher/triton that referenced this pull request Dec 10, 2024
Upgrading LLVM to pick up the following changes for AMD backend:
* llvm/llvm-project#112237

Changes made:
- changed the signature of `visit` method in `ConstantAnalysis` - i.e.,
  accepts an instance of the `ProgramPoint`.
- updated calls to `getLatticeElementFor` -i.e., accepts an instance of
  the `ProgramPoint`.
- added the required last parameter to `LLVM::DISubprogramAttr::get` -
  i.e., an empty `annotations`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants