mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-18 18:42:46 +02:00
Teach GlobalISelEmitter to treat used iPTRAny operands as pointer operands
Overloaded intrinsics can use iPTRAny in used/input operands. The GlobalISelEmitter doesn't know that these are pointers, so it treats them as scalars. As a result, these intrinsics can't be imported. This teaches the GlobalISelEmitter to recognize these as pointers rather than scalars. Differential Revision: https://reviews.llvm.org/D65756 llvm-svn: 369455
This commit is contained in:
parent
1327aad4e4
commit
defcf6aa12
33
test/TableGen/GlobalISelEmitterOverloadedPtr.td
Normal file
33
test/TableGen/GlobalISelEmitterOverloadedPtr.td
Normal file
@ -0,0 +1,33 @@
|
||||
// RUN: llvm-tblgen -gen-global-isel -I %p/../../include -I %p/Common %s -o - | FileCheck %s
|
||||
|
||||
// Boilerplate code.
|
||||
include "llvm/Target/Target.td"
|
||||
include "GlobalISelEmitterCommon.td"
|
||||
|
||||
let TargetPrefix = "mytarget" in {
|
||||
def int_mytarget_anyptr : Intrinsic<[llvm_i32_ty], [llvm_anyptr_ty]>;
|
||||
}
|
||||
|
||||
// Ensure that llvm_anyptr_ty on an intrinsic results in a
|
||||
// GIM_CheckPointerToAny rather than a GIM_CheckType.
|
||||
//
|
||||
// CHECK: GIM_CheckCxxInsnPredicate, /*MI*/0, /*FnId*/GIPFP_MI_Predicate_frag_anyptr,
|
||||
// CHECK-NEXT: GIM_CheckRegBankForClass, /*MI*/0, /*Op*/0, /*RC*/MyTarget::GPR32RegClassID,
|
||||
// CHECK-NEXT: // MIs[0] src
|
||||
// CHECK-NEXT: GIM_CheckPointerToAny, /*MI*/0, /*Op*/2, /*SizeInBits*/32,
|
||||
// CHECK-NEXT: GIM_CheckRegBankForClass, /*MI*/0, /*Op*/2, /*RC*/MyTarget::GPR32RegClassID,
|
||||
// CHECK-NEXT: // (intrinsic_w_chain:{ *:[i32] } {{[0-9]+}}:{ *:[iPTR] }, GPR32:{ *:[i32] }:$src)<<P:Predicate_frag_anyptr>> => (ANYLOAD:{ *:[i32] } GPR32:{ *:[i32] }:$src)
|
||||
// CHECK-NEXT: GIR_BuildMI, /*InsnID*/0, /*Opcode*/MyTarget::ANYLOAD,
|
||||
let hasSideEffects = 1 in {
|
||||
def ANYLOAD : I<(outs GPR32:$dst), (ins GPR32:$src1),
|
||||
[(set GPR32:$dst, (load GPR32:$src1))]>;
|
||||
}
|
||||
|
||||
def frag_anyptr : PatFrag<(ops node:$src),
|
||||
(int_mytarget_anyptr node:$src),
|
||||
[{ return true; // C++ code }]> {
|
||||
let GISelPredicateCode = [{ return true; // C++ code }];
|
||||
}
|
||||
|
||||
def : Pat<(frag_anyptr GPR32:$src),
|
||||
(p0 (ANYLOAD GPR32:$src))>;
|
@ -155,6 +155,13 @@ struct CodeGenIntrinsic {
|
||||
return Properties & (1 << Prop);
|
||||
}
|
||||
|
||||
/// Returns true if the parameter at \p ParamIdx is a pointer type. Returns
|
||||
/// false if the parameter is not a pointer, or \p ParamIdx is greater than
|
||||
/// the size of \p IS.ParamVTs.
|
||||
///
|
||||
/// Note that this requires that \p IS.ParamVTs is available.
|
||||
bool isParamAPointer(unsigned ParamIdx) const;
|
||||
|
||||
CodeGenIntrinsic(Record *R);
|
||||
};
|
||||
|
||||
|
@ -763,3 +763,10 @@ CodeGenIntrinsic::CodeGenIntrinsic(Record *R) {
|
||||
// Sort the argument attributes for later benefit.
|
||||
llvm::sort(ArgumentAttributes);
|
||||
}
|
||||
|
||||
bool CodeGenIntrinsic::isParamAPointer(unsigned ParamIdx) const {
|
||||
if (ParamIdx >= IS.ParamVTs.size())
|
||||
return false;
|
||||
MVT ParamType = MVT(IS.ParamVTs[ParamIdx]);
|
||||
return ParamType == MVT::iPTR || ParamType == MVT::iPTRAny;
|
||||
}
|
||||
|
@ -3482,6 +3482,13 @@ Expected<InstructionMatcher &> GlobalISelEmitter::createAndImportSelDAGMatcher(
|
||||
}
|
||||
|
||||
// Match the used operands (i.e. the children of the operator).
|
||||
bool IsIntrinsic =
|
||||
SrcGIOrNull->TheDef->getName() == "G_INTRINSIC" ||
|
||||
SrcGIOrNull->TheDef->getName() == "G_INTRINSIC_W_SIDE_EFFECTS";
|
||||
const CodeGenIntrinsic *II = Src->getIntrinsicInfo(CGP);
|
||||
if (IsIntrinsic && !II)
|
||||
return failedImport("Expected IntInit containing intrinsic ID)");
|
||||
|
||||
for (unsigned i = 0, e = Src->getNumChildren(); i != e; ++i) {
|
||||
TreePatternNode *SrcChild = Src->getChild(i);
|
||||
|
||||
@ -3490,19 +3497,21 @@ Expected<InstructionMatcher &> GlobalISelEmitter::createAndImportSelDAGMatcher(
|
||||
// Coerce integers to pointers to address space 0 if the context indicates a pointer.
|
||||
bool OperandIsAPointer = SrcGIOrNull->isOperandAPointer(i);
|
||||
|
||||
// For G_INTRINSIC/G_INTRINSIC_W_SIDE_EFFECTS, the operand immediately
|
||||
// following the defs is an intrinsic ID.
|
||||
if ((SrcGIOrNull->TheDef->getName() == "G_INTRINSIC" ||
|
||||
SrcGIOrNull->TheDef->getName() == "G_INTRINSIC_W_SIDE_EFFECTS") &&
|
||||
i == 0) {
|
||||
if (const CodeGenIntrinsic *II = Src->getIntrinsicInfo(CGP)) {
|
||||
if (IsIntrinsic) {
|
||||
// For G_INTRINSIC/G_INTRINSIC_W_SIDE_EFFECTS, the operand immediately
|
||||
// following the defs is an intrinsic ID.
|
||||
if (i == 0) {
|
||||
OperandMatcher &OM =
|
||||
InsnMatcher.addOperand(OpIdx++, SrcChild->getName(), TempOpIdx);
|
||||
OM.addPredicate<IntrinsicIDOperandMatcher>(II);
|
||||
continue;
|
||||
}
|
||||
|
||||
return failedImport("Expected IntInit containing instrinsic ID)");
|
||||
// We have to check intrinsics for llvm_anyptr_ty parameters.
|
||||
//
|
||||
// Note that we have to look at the i-1th parameter, because we don't
|
||||
// have the intrinsic ID in the intrinsic's parameter list.
|
||||
OperandIsAPointer |= II->isParamAPointer(i - 1);
|
||||
}
|
||||
|
||||
if (auto Error =
|
||||
|
Loading…
Reference in New Issue
Block a user