[clang] [CIR] Mark inline asm convergent in GPU code (PR #233772)
via cfe-commits
cfe-commits at lists.llvm.org
Mon Nov 2 07:53:50 PST 2026
llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-clangir
Author: Arseniy Obolenskiy (aobolensk)
<details>
<summary>Changes</summary>
Inline asm may hide a barrier, so it must not be moved into divergent control flow
depends on https://github.com/llvm/llvm-project/pull/233770
---
Full diff: https://github.com/llvm/llvm-project/pull/233772.diff
7 Files Affected:
- (modified) clang/include/clang/CIR/Dialect/IR/CIROps.td (+5-2)
- (modified) clang/lib/CIR/CodeGen/CIRGenAsm.cpp (+4-1)
- (modified) clang/lib/CIR/Dialect/IR/CIRDialect.cpp (+10-1)
- (modified) clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp (+1-1)
- (modified) clang/test/CIR/CodeGen/offload-convergent-attr.cu (+11)
- (modified) clang/test/CIR/IR/inline-asm.cir (+14)
- (modified) clang/test/CIR/Lowering/inline-asm.cir (+12)
``````````diff
diff --git a/clang/include/clang/CIR/Dialect/IR/CIROps.td b/clang/include/clang/CIR/Dialect/IR/CIROps.td
index bd762aae3e1d7e..07c269f11a44d5 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIROps.td
+++ b/clang/include/clang/CIR/Dialect/IR/CIROps.td
@@ -5930,6 +5930,9 @@ def CIR_InlineAsmOp : CIR_Op<"asm",
order: output, input and then in/out operands. When several output operands
are present, the result type may be represented as an anonymous record type.
+ The `convergent` attribute marks asm that may contain convergent
+ operations, so it must not be moved across divergent control flow.
+
Example:
```C++
__asm__("foo" : : : );
@@ -5972,13 +5975,13 @@ def CIR_InlineAsmOp : CIR_Op<"asm",
let arguments =
(ins VariadicOfVariadic<AnyType, "operands_segments">:$asm_operands,
StrAttr:$asm_string, StrAttr:$constraints, UnitAttr:$side_effects,
- CIR_AsmFlavorAttr:$asm_flavor, ArrayAttr:$operand_attrs,
+ UnitAttr:$convergent, CIR_AsmFlavorAttr:$asm_flavor, ArrayAttr:$operand_attrs,
DenseI32ArrayAttr:$operands_segments);
let builders = [OpBuilder<(ins
"llvm::ArrayRef<mlir::ValueRange>":$asmOperands,
"llvm::StringRef":$asmString, "llvm::StringRef":$constraints,
- "bool":$sideEffects, "AsmFlavor":$asmFlavor,
+ "bool":$sideEffects, "bool":$convergent, "AsmFlavor":$asmFlavor,
"llvm::ArrayRef<mlir::Attribute>":$operandAttrs)>];
let hasCustomAssemblyFormat = 1;
diff --git a/clang/lib/CIR/CodeGen/CIRGenAsm.cpp b/clang/lib/CIR/CodeGen/CIRGenAsm.cpp
index c3c676bd742c12..06ddf579f20630 100644
--- a/clang/lib/CIR/CodeGen/CIRGenAsm.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenAsm.cpp
@@ -544,11 +544,14 @@ mlir::LogicalResult CIRGenFunction::emitAsmStmt(const AsmStmt &s) {
cir::RecordType::getAllDataKinds(resultRegTypes));
bool hasSideEffect = s.isVolatile() || s.getNumOutputs() == 0;
+ // Asm may contain an intrinsically convergent op such as a barrier.
+ bool isConvergent = getLangOpts().assumeFunctionsAreConvergent();
std::vector<mlir::Value> regResults;
cir::InlineAsmOp ia = cir::InlineAsmOp::create(
builder, getLoc(s.getAsmLoc()), resultType, operands, asmString,
- constraints, hasSideEffect, inferFlavor(cgm, s), mlir::ArrayAttr());
+ constraints, hasSideEffect, isConvergent, inferFlavor(cgm, s),
+ mlir::ArrayAttr());
if (isGCCAsmGoto) {
assert(!cir::MissingFeatures::asmGoto());
diff --git a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
index dae8005f870d75..69dd9387eb4bab 100644
--- a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
+++ b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
@@ -4890,6 +4890,8 @@ void cir::InlineAsmOp::print(OpAsmPrinter &p) {
p << ')';
if (getSideEffects())
p << " side_effects";
+ if (getConvergent())
+ p << " convergent";
p.printOptionalAttrDict(
getOperation()->getDiscardableAttrDictionary().getValue());
@@ -4901,7 +4903,8 @@ void cir::InlineAsmOp::print(OpAsmPrinter &p) {
void cir::InlineAsmOp::build(OpBuilder &odsBuilder, OperationState &odsState,
ArrayRef<ValueRange> asmOperands,
StringRef asmString, StringRef constraints,
- bool sideEffects, cir::AsmFlavor asmFlavor,
+ bool sideEffects, bool convergent,
+ cir::AsmFlavor asmFlavor,
ArrayRef<Attribute> operandAttrs) {
// Set up the operands_segments for VariadicOfVariadic
SmallVector<int32_t> segments;
@@ -4921,6 +4924,9 @@ void cir::InlineAsmOp::build(OpBuilder &odsBuilder, OperationState &odsState,
if (sideEffects)
odsState.addAttribute("side_effects", odsBuilder.getUnitAttr());
+ if (convergent)
+ odsState.addAttribute("convergent", odsBuilder.getUnitAttr());
+
odsState.addAttribute("operand_attrs", odsBuilder.getArrayAttr(operandAttrs));
}
@@ -5032,6 +5038,9 @@ ParseResult cir::InlineAsmOp::parse(OpAsmParser &parser,
if (parser.parseOptionalKeyword("side_effects").succeeded())
result.attributes.set("side_effects", UnitAttr::get(ctxt));
+ if (parser.parseOptionalKeyword("convergent").succeeded())
+ result.attributes.set("convergent", UnitAttr::get(ctxt));
+
if (parser.parseOptionalAttrDict(result.attributes).failed())
return mlir::failure();
diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
index 9d74696bde0d39..760483b45cc22a 100644
--- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
+++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
@@ -6286,7 +6286,7 @@ mlir::LogicalResult CIRToLLVMInlineAsmOpLowering::matchAndRewrite(
/*tail_call_kind*/
mlir::LLVM::TailCallKindAttr::get(
getContext(), mlir::LLVM::tailcallkind::TailCallKind::None),
- /*convergent=*/mlir::UnitAttr(),
+ op.getConvergentAttr(),
mlir::LLVM::AsmDialectAttr::get(getContext(), llDialect),
rewriter.getArrayAttr(opAttrs));
diff --git a/clang/test/CIR/CodeGen/offload-convergent-attr.cu b/clang/test/CIR/CodeGen/offload-convergent-attr.cu
index 1112ca36143265..16bbc2f4ead55b 100644
--- a/clang/test/CIR/CodeGen/offload-convergent-attr.cu
+++ b/clang/test/CIR/CodeGen/offload-convergent-attr.cu
@@ -33,6 +33,15 @@ void caller() {
// CIR: cir.return
// LLVM: call void{{.*}}@no_conv() #[[NO_CONV_CALL_ATTR:.*]]
}
+
+// CIR: cir.func{{.*}}@inline_asm
+__attribute__((device))
+void inline_asm() {
+ asm volatile("");
+ // CIR: cir.asm(
+ // CIR: side_effects convergent
+ // LLVM: call void asm sideeffect "", "{{.*}}"() #[[ASM_ATTR:[0-9]+]]
+}
}
// LLVM: attributes #[[NORMAL_ATTR]]
@@ -43,3 +52,5 @@ void caller() {
// LLVM-SAME: convergent
// LLVM: attributes #[[NO_CONV_CALL_ATTR]]
// LLVM-NOT: convergent
+// LLVM: attributes #[[ASM_ATTR]]
+// LLVM-SAME: convergent
diff --git a/clang/test/CIR/IR/inline-asm.cir b/clang/test/CIR/IR/inline-asm.cir
index 5134df5f4b5eb0..fc59c5b9ac4eaf 100644
--- a/clang/test/CIR/IR/inline-asm.cir
+++ b/clang/test/CIR/IR/inline-asm.cir
@@ -123,4 +123,18 @@ cir.func @f8() -> !s32i {
{"movl $$7, $0" "=r,~{dirflag},~{fpsr},~{flags}"}) side_effects {test.attr = 7 : i32} -> !s32i
cir.return %0 : !s32i
}
+
+cir.func @f9() {
+ // CHECK: cir.asm(x86_att,
+ // CHECK: out = [],
+ // CHECK: in = [],
+ // CHECK: in_out = [],
+ // CHECK: {"" "~{dirflag},~{fpsr},~{flags}"}) side_effects convergent
+ cir.asm(x86_att,
+ out = [],
+ in = [],
+ in_out = [],
+ {"" "~{dirflag},~{fpsr},~{flags}"}) side_effects convergent
+ cir.return
+}
}
diff --git a/clang/test/CIR/Lowering/inline-asm.cir b/clang/test/CIR/Lowering/inline-asm.cir
index b510f23595ae6b..9a5bd8b16f54b2 100644
--- a/clang/test/CIR/Lowering/inline-asm.cir
+++ b/clang/test/CIR/Lowering/inline-asm.cir
@@ -83,4 +83,16 @@ cir.func @f7(%arg0: !u32i) -> !u32i {
%3 = cir.load align(4) %0 : !cir.ptr<!u32i>, !u32i
cir.return %3 : !u32i
}
+
+cir.func @f8() {
+ // CHECK: call void asm sideeffect "", "~{dirflag},~{fpsr},~{flags}"() #[[CONV:[0-9]+]]
+ cir.asm(x86_att,
+ out = [],
+ in = [],
+ in_out = [],
+ {"" "~{dirflag},~{fpsr},~{flags}"}) side_effects convergent
+ cir.return
}
+}
+
+// CHECK: attributes #[[CONV]] = { convergent }
``````````
</details>
https://github.com/llvm/llvm-project/pull/233772
More information about the cfe-commits
mailing list