Skip to content

Commit 3ccc914

Browse files
committed
Remove optional attribute
1 parent 5d08e48 commit 3ccc914

File tree

7 files changed

+8
-18
lines changed

7 files changed

+8
-18
lines changed

mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2308,8 +2308,7 @@ def LLVM_InlineAsmOp : LLVM_Op<"inline_asm", [DeclareOpInterfaceMethods<MemoryEf
23082308
StrAttr:$constraints,
23092309
UnitAttr:$has_side_effects,
23102310
UnitAttr:$is_align_stack,
2311-
OptionalAttr<
2312-
DefaultValuedAttr<TailCallKind, "TailCallKind::None">>:$tail_call_kind,
2311+
DefaultValuedAttr<TailCallKind, "TailCallKind::None">:$tail_call_kind,
23132312
OptionalAttr<
23142313
DefaultValuedAttr<AsmATTOrIntel, "AsmDialect::AD_ATT">>:$asm_dialect,
23152314
OptionalAttr<ArrayAttr>:$operand_attrs);

mlir/lib/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ struct LDSBarrierOpLowering : public ConvertOpToLLVMPattern<LDSBarrierOp> {
439439
op,
440440
/*resultTypes=*/TypeRange(), /*operands=*/ValueRange(),
441441
/*asm_string=*/asmStr, constraints, /*has_side_effects=*/true,
442-
/*is_align_stack=*/false, /*tail_call_kind=*/nullptr,
442+
/*is_align_stack=*/false, LLVM::TailCallKind::None,
443443
/*asm_dialect=*/asmDialectAttr,
444444
/*operand_attrs=*/ArrayAttr());
445445
return success();

mlir/lib/Conversion/NVGPUToNVVM/NVGPUToNVVM.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -571,8 +571,7 @@ static FailureOr<LLVM::InlineAsmOp> emitMmaSparseSyncOpAsm(
571571
/*asm_string=*/asmStr,
572572
/*constraints=*/constraintStr,
573573
/*has_side_effects=*/true,
574-
/*is_align_stack=*/false,
575-
/*tail_call_kind=*/nullptr,
574+
/*is_align_stack=*/false, LLVM::TailCallKind::None,
576575
/*asm_dialect=*/asmDialectAttr,
577576
/*operand_attrs=*/ArrayAttr());
578577
}

mlir/lib/Dialect/LLVMIR/IR/BasicPtxBuilderInterface.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ LLVM::InlineAsmOp PtxBuilder::build() {
139139
/*asm_string=*/llvm::StringRef(ptxInstruction),
140140
/*constraints=*/registerConstraints.data(),
141141
/*has_side_effects=*/interfaceOp.hasSideEffect(),
142-
/*is_align_stack=*/false,
143-
/*tail_call_kind=*/nullptr,
142+
/*is_align_stack=*/false, LLVM::TailCallKind::None,
144143
/*asm_dialect=*/asmDialectAttr,
145144
/*operand_attrs=*/ArrayAttr());
146145
}

mlir/lib/Dialect/X86Vector/Transforms/AVXTranspose.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Value mlir::x86vector::avx2::inline_asm::mm256BlendPsAsm(
4141
auto asmOp = b.create<LLVM::InlineAsmOp>(
4242
v1.getType(), /*operands=*/asmVals, /*asm_string=*/asmStr,
4343
/*constraints=*/asmCstr, /*has_side_effects=*/false,
44-
/*is_align_stack=*/false, /*tail_call_kind=*/nullptr,
44+
/*is_align_stack=*/false, LLVM::TailCallKind::None,
4545
/*asm_dialect=*/asmDialectAttr,
4646
/*operand_attrs=*/ArrayAttr());
4747
return asmOp.getResult(0);

mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -508,9 +508,8 @@ convertOperationImpl(Operation &opInst, llvm::IRBuilderBase &builder,
508508
llvm::CallInst *inst = builder.CreateCall(
509509
inlineAsmInst,
510510
moduleTranslation.lookupValues(inlineAsmOp.getOperands()));
511-
if (inlineAsmOp.getTailCallKindAttr())
512-
inst->setTailCallKind(convertTailCallKindToLLVM(
513-
inlineAsmOp.getTailCallKindAttr().getTailCallKind()));
511+
inst->setTailCallKind(convertTailCallKindToLLVM(
512+
inlineAsmOp.getTailCallKindAttr().getTailCallKind()));
514513
if (auto maybeOperandAttrs = inlineAsmOp.getOperandAttrs()) {
515514
llvm::AttributeList attrList;
516515
for (const auto &it : llvm::enumerate(*maybeOperandAttrs)) {

mlir/lib/Target/LLVMIR/ModuleImport.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2195,19 +2195,13 @@ LogicalResult ModuleImport::convertInstruction(llvm::Instruction *inst) {
21952195
if (!resultTy)
21962196
return failure();
21972197
ArrayAttr operandAttrs = convertAsmInlineOperandAttrs(*callInst);
2198-
bool hasTailCallKind =
2199-
callInst->getTailCallKind() != llvm::CallInst::TCK_None;
22002198
return builder
22012199
.create<InlineAsmOp>(
22022200
loc, resultTy, *operands,
22032201
builder.getStringAttr(asmI->getAsmString()),
22042202
builder.getStringAttr(asmI->getConstraintString()),
22052203
asmI->hasSideEffects(), asmI->isAlignStack(),
2206-
hasTailCallKind
2207-
? TailCallKindAttr::get(mlirModule.getContext(),
2208-
convertTailCallKindFromLLVM(
2209-
callInst->getTailCallKind()))
2210-
: nullptr,
2204+
convertTailCallKindFromLLVM(callInst->getTailCallKind()),
22112205
AsmDialectAttr::get(
22122206
mlirModule.getContext(),
22132207
convertAsmDialectFromLLVM(asmI->getDialect())),

0 commit comments

Comments
 (0)