Skip to content

Commit 3f9e17f

Browse files
JanRehders-AMDtsymalla-AMD
JanRehders-AMD
authored and
tsymalla-AMD
committed
Fix intrinsic name conflict
1 parent e27f76c commit 3f9e17f

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

‎example/ExampleDialect.td‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ def HandleGetOp : ExampleOp<"handle.get", [Memory<[]>, NoUnwind, WillReturn]> {
269269
}];
270270
}
271271

272-
def InstNameConflictOp : Op<ExampleDialect, "try.conflict", [WillReturn]> {
272+
def InstNameConflictOp : Op<ExampleDialect, "inst.name.conflict", [WillReturn]> {
273273
let results = (outs I32:$result);
274274
let arguments = (ins value:$instName);
275275

@@ -281,7 +281,7 @@ def InstNameConflictOp : Op<ExampleDialect, "try.conflict", [WillReturn]> {
281281
}];
282282
}
283283

284-
def InstNameConflictDoubleOp : Op<ExampleDialect, "try.conflict", [WillReturn]> {
284+
def InstNameConflictDoubleOp : Op<ExampleDialect, "inst.name.conflict.double", [WillReturn]> {
285285
let results = (outs I32:$result);
286286
let arguments = (ins value:$instName, value:$instName_0);
287287

@@ -292,7 +292,7 @@ def InstNameConflictDoubleOp : Op<ExampleDialect, "try.conflict", [WillReturn]>
292292
}];
293293
}
294294

295-
def InstNameConflictVarargsOp : Op<ExampleDialect, "try.conflict.type.suffix", [WillReturn]> {
295+
def InstNameConflictVarargsOp : Op<ExampleDialect, "inst.name.conflict.varargs", [WillReturn]> {
296296
let results = (outs I32:$result);
297297
let arguments = (ins varargs:$instName_0);
298298

‎test/example/generated/ExampleDialect.cpp.inc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,7 +1186,7 @@ index
11861186

11871187

11881188

1189-
const ::llvm::StringLiteral InstNameConflictDoubleOp::s_name{"xd.try.conflict"};
1189+
const ::llvm::StringLiteral InstNameConflictDoubleOp::s_name{"xd.inst.name.conflict.double"};
11901190

11911191
InstNameConflictDoubleOp* InstNameConflictDoubleOp::create(llvm_dialects::Builder& b, ::llvm::Value * instName, ::llvm::Value * instName_0, const llvm::Twine &instName_1) {
11921192
::llvm::LLVMContext& context = b.getContext();
@@ -1270,7 +1270,7 @@ instName_0
12701270

12711271

12721272

1273-
const ::llvm::StringLiteral InstNameConflictOp::s_name{"xd.try.conflict"};
1273+
const ::llvm::StringLiteral InstNameConflictOp::s_name{"xd.inst.name.conflict"};
12741274

12751275
InstNameConflictOp* InstNameConflictOp::create(llvm_dialects::Builder& b, ::llvm::Value * instName, const llvm::Twine &instName_0) {
12761276
::llvm::LLVMContext& context = b.getContext();
@@ -1344,7 +1344,7 @@ instName
13441344

13451345

13461346

1347-
const ::llvm::StringLiteral InstNameConflictVarargsOp::s_name{"xd.try.conflict.type.suffix"};
1347+
const ::llvm::StringLiteral InstNameConflictVarargsOp::s_name{"xd.inst.name.conflict.varargs"};
13481348

13491349
InstNameConflictVarargsOp* InstNameConflictVarargsOp::create(llvm_dialects::Builder& b, ::llvm::ArrayRef<::llvm::Value *> instName_0, const llvm::Twine &instName) {
13501350
::llvm::LLVMContext& context = b.getContext();
@@ -2144,23 +2144,23 @@ data
21442144
template <>
21452145
const ::llvm_dialects::OpDescription &
21462146
::llvm_dialects::OpDescription::get<xd::InstNameConflictDoubleOp>() {
2147-
static const ::llvm_dialects::OpDescription desc{false, "xd.try.conflict"};
2147+
static const ::llvm_dialects::OpDescription desc{false, "xd.inst.name.conflict.double"};
21482148
return desc;
21492149
}
21502150

21512151

21522152
template <>
21532153
const ::llvm_dialects::OpDescription &
21542154
::llvm_dialects::OpDescription::get<xd::InstNameConflictOp>() {
2155-
static const ::llvm_dialects::OpDescription desc{false, "xd.try.conflict"};
2155+
static const ::llvm_dialects::OpDescription desc{false, "xd.inst.name.conflict"};
21562156
return desc;
21572157
}
21582158

21592159

21602160
template <>
21612161
const ::llvm_dialects::OpDescription &
21622162
::llvm_dialects::OpDescription::get<xd::InstNameConflictVarargsOp>() {
2163-
static const ::llvm_dialects::OpDescription desc{false, "xd.try.conflict.type.suffix"};
2163+
static const ::llvm_dialects::OpDescription desc{false, "xd.inst.name.conflict.varargs"};
21642164
return desc;
21652165
}
21662166

‎test/example/generated/ExampleDialect.h.inc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ bool verifier(::llvm::raw_ostream &errs);
299299
};
300300

301301
class InstNameConflictDoubleOp : public ::llvm::CallInst {
302-
static const ::llvm::StringLiteral s_name; //{"xd.try.conflict"};
302+
static const ::llvm::StringLiteral s_name; //{"xd.inst.name.conflict.double"};
303303

304304
public:
305305
static bool classof(const ::llvm::CallInst* i) {
@@ -324,7 +324,7 @@ bool verifier(::llvm::raw_ostream &errs);
324324
};
325325

326326
class InstNameConflictOp : public ::llvm::CallInst {
327-
static const ::llvm::StringLiteral s_name; //{"xd.try.conflict"};
327+
static const ::llvm::StringLiteral s_name; //{"xd.inst.name.conflict"};
328328

329329
public:
330330
static bool classof(const ::llvm::CallInst* i) {
@@ -347,7 +347,7 @@ bool verifier(::llvm::raw_ostream &errs);
347347
};
348348

349349
class InstNameConflictVarargsOp : public ::llvm::CallInst {
350-
static const ::llvm::StringLiteral s_name; //{"xd.try.conflict.type.suffix"};
350+
static const ::llvm::StringLiteral s_name; //{"xd.inst.name.conflict.varargs"};
351351

352352
public:
353353
static bool classof(const ::llvm::CallInst* i) {

‎test/example/test-builder.test‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
; CHECK-NEXT: call void (...) @xd.write([[TMP1]] [[TMP17]])
3535
; CHECK-NEXT: call void (...) @xd.write([[TMP2]] [[TMP18]])
3636
; CHECK-NEXT: [[NAME_OF_LLVM_VALUE:%.*]] = call target("xd.handle") @xd.handle.get()
37-
; CHECK-NEXT: [[TMP19:%.*]] = call i32 (...) @xd.try.conflict(i32 1)
38-
; CHECK-NEXT: [[NAME_FOO:%.*]] = call i32 (...) @xd.try.conflict(i32 1)
39-
; CHECK-NEXT: [[TMP20:%.*]] = call i32 (...) @xd.try.conflict(i32 1, i32 2)
40-
; CHECK-NEXT: [[BAR:%.*]] = call i32 (...) @xd.try.conflict(i32 1, i32 2)
41-
; CHECK-NEXT: [[TMP21:%.*]] = call i32 (...) @xd.try.conflict.type.suffix(ptr [[P1]], i8 [[P2]])
42-
; CHECK-NEXT: [[TWO_VARARGS:%.*]] = call i32 (...) @xd.try.conflict.type.suffix(ptr [[P1]], i8 [[P2]])
43-
; CHECK-NEXT: [[THREE_VARARGS:%.*]] = call i32 (...) @xd.try.conflict.type.suffix(ptr [[P1]], i8 [[P2]], i32 3)
44-
; CHECK-NEXT: [[FOUR_VARARGS:%.*]] = call i32 (...) @xd.try.conflict.type.suffix(ptr [[P1]], i8 [[P2]], i32 3, i32 4)
37+
; CHECK-NEXT: [[TMP19:%.*]] = call i32 (...) @xd.inst.name.conflict(i32 1)
38+
; CHECK-NEXT: [[NAME_FOO:%.*]] = call i32 (...) @xd.inst.name.conflict(i32 1)
39+
; CHECK-NEXT: [[TMP20:%.*]] = call i32 (...) @xd.inst.name.conflict.double(i32 1, i32 2)
40+
; CHECK-NEXT: [[BAR:%.*]] = call i32 (...) @xd.inst.name.conflict.double(i32 1, i32 2)
41+
; CHECK-NEXT: [[TMP21:%.*]] = call i32 (...) @xd.inst.name.conflict.varargs(ptr [[P1]], i8 [[P2]])
42+
; CHECK-NEXT: [[TWO_VARARGS:%.*]] = call i32 (...) @xd.inst.name.conflict.varargs(ptr [[P1]], i8 [[P2]])
43+
; CHECK-NEXT: [[THREE_VARARGS:%.*]] = call i32 (...) @xd.inst.name.conflict.varargs(ptr [[P1]], i8 [[P2]], i32 3)
44+
; CHECK-NEXT: [[FOUR_VARARGS:%.*]] = call i32 (...) @xd.inst.name.conflict.varargs(ptr [[P1]], i8 [[P2]], i32 3, i32 4)
4545
; CHECK-NEXT: ret void
4646
;

0 commit comments

Comments
 (0)