Skip to content

Commit 12a4dc4

Browse files
committed
[MIRParser] Accept overloaded intrinsic names w/o type suffixes
Function::lookupIntrinsicID is somewhat forgiving as it comes to overloaded intrinsics' names: it returns an ID as soon as the name provided has a prefix that matches a registered intrinsic's name w/o actually checking that the rest of the name encodes all the concrete arg types, let alone that those types are compatible with the intrinsic's definition. That's probably fine and comes in handy in MIR serialization: we don't care about IR types at MIR level and every intrinsic should be selectable based on its ID and low-level types (LLTs) of its operands, including the overloaded ones, so there is no point in serializing mangled IR types as part of the intrinsic's name. However, lookupIntrinsicID is somewhat inconsistent in its forgiveness: if the name provided is actually an exact match, it will refuse to return the ID if the intrinsic is overloaded. There is probably no real reason for that and it renders MIRParser incapable to deserialize MIR MIRPrinter serialized. This commit fixes it. Reviewers: rnk, aditya_nandakumar, qcolombet, thegameg, dsanders, marcello.maggioni Reviewed By: bogner Subscribers: javed.absar, llvm-commits Differential Revision: https://reviews.llvm.org/D43267 llvm-svn: 326387
1 parent eb9d944 commit 12a4dc4

File tree

2 files changed

+29
-3
lines changed

2 files changed

+29
-3
lines changed

llvm/lib/IR/Function.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -523,9 +523,11 @@ Intrinsic::ID Function::lookupIntrinsicID(StringRef Name) {
523523
Intrinsic::ID ID = static_cast<Intrinsic::ID>(Idx + Adjust);
524524

525525
// If the intrinsic is not overloaded, require an exact match. If it is
526-
// overloaded, require a prefix match.
527-
bool IsPrefixMatch = Name.size() > strlen(NameTable[Idx]);
528-
return IsPrefixMatch == isOverloaded(ID) ? ID : Intrinsic::not_intrinsic;
526+
// overloaded, require either exact or prefix match.
527+
const auto MatchSize = strlen(NameTable[Idx]);
528+
assert(Name.size() >= MatchSize && "Expected either exact or prefix match");
529+
bool IsExactMatch = Name.size() == MatchSize;
530+
return IsExactMatch || isOverloaded(ID) ? ID : Intrinsic::not_intrinsic;
529531
}
530532

531533
void Function::recalculateIntrinsicID() {
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# RUN: llc -mtriple aarch64-- -run-pass irtranslator -simplify-mir %s -o %t \
2+
# RUN: -verify-machineinstrs; llc -mtriple aarch64-- -run-pass legalizer \
3+
# RUN: -simplify-mir %t -x mir -o - -verify-machineinstrs | FileCheck %s
4+
5+
# Test that MIRParser is able to deserialize back MIR MIRPrinter serialized,
6+
# specifically overloaded intrinsic names in this case which aren't required
7+
# to encode all the concrete arg types in the name at MIR level.
8+
9+
--- |
10+
define i32 @int_aarch64_sdiv(i32 %a, i32 %b) nounwind readnone ssp {
11+
; CHECK-LABEL: name: int_aarch64_sdiv
12+
; CHECK: liveins: $w0, $w1
13+
; CHECK: [[COPY:%[0-9]+]]:_(s32) = COPY $w0
14+
; CHECK: [[COPY1:%[0-9]+]]:_(s32) = COPY $w1
15+
; CHECK: [[INT:%[0-9]+]]:_(s32) = G_INTRINSIC intrinsic(@llvm.aarch64.sdiv), [[COPY]](s32), [[COPY1]](s32)
16+
; CHECK: $w0 = COPY [[INT]](s32)
17+
; CHECK: RET_ReallyLR implicit $w0
18+
entry:
19+
%sdiv = call i32 @llvm.aarch64.sdiv.i32(i32 %a, i32 %b)
20+
ret i32 %sdiv
21+
}
22+
23+
declare i32 @llvm.aarch64.sdiv.i32(i32, i32) nounwind readnone
24+
...

0 commit comments

Comments
 (0)