Skip to content

[TableGen][GISel] Reuse importNodeRenderer for OperandWithDefaultOps #121285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 4, 2025
Merged

[TableGen][GISel] Reuse importNodeRenderer for OperandWithDefaultOps #121285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0690683
[TableGen][GISel] Reuse `importNodeRenderer` for `OperandWithDefaultOps`
s-barannikov Dec 29, 2024
daa7154
Check std::optional before dereferencing
s-barannikov Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions llvm/test/TableGen/GlobalISelEmitter/undef-tied-input.td
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
// RUN: llvm-tblgen -gen-global-isel -I %p/../../../include -I %p/../Common %s | FileCheck %s
// RUN: llvm-tblgen -gen-global-isel -warn-on-skipped-patterns \
// RUN: -I %p/../../../include -I %p/../Common %s 2> %t | FileCheck %s
// RUN: FileCheck -check-prefix=ERR %s < %t

include "llvm/Target/Target.td"
include "GlobalISelEmitterCommon.td"

def undef_tied : OperandWithDefaultOps<untyped, (ops (i32 undef_tied_input))> {
def undef_tied_1 : OperandWithDefaultOps<untyped, (ops (i32 undef_tied_input))> {
let MIOperandInfo = (ops GPR32:$inactive);
}

def undef_tied_2 : OperandWithDefaultOps<i32, (ops (untyped undef_tied_input))> {
let MIOperandInfo = (ops GPR32:$inactive);
}

let Constraints = "$opt.inactive = $rd" in
def I1 : I<(outs GPR32:$rd), (ins GPR32:$rs, undef_tied_1:$opt),
[(set GPR32:$rd, (abs i32:$rs))]>;

// ERR: [[#@LINE+2]]:5: warning: Skipped pattern: unsupported type
let Constraints = "$opt.inactive = $rd" in
def I1 : I<(outs GPR32:$rd), (ins GPR32:$rs, undef_tied:$opt),
def I2 : I<(outs GPR32:$rd), (ins GPR32:$rs, undef_tied_2:$opt),
[(set GPR32:$rd, (abs i32:$rs))]>;

// CHECK-LABEL: // (abs:{ *:[i32] } i32:{ *:[i32] }:$rs) => (I1:{ *:[i32] } i32:{ *:[i32] }:$rs)
Expand Down
82 changes: 29 additions & 53 deletions llvm/utils/TableGen/GlobalISelEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,8 @@ class GlobalISelEmitter final : public GlobalISelMatchTableExecutorEmitter {
const TreePatternNode &N) const;

Error importLeafNodeRenderer(RuleMatcher &M, BuildMIAction &MIBuilder,
const TreePatternNode &N) const;
const TreePatternNode &N,
action_iterator InsertPt) const;

Error importXFormNodeRenderer(RuleMatcher &M, BuildMIAction &MIBuilder,
const TreePatternNode &N) const;
Expand All @@ -431,9 +432,6 @@ class GlobalISelEmitter final : public GlobalISelMatchTableExecutorEmitter {
const TreePatternNode &N,
action_iterator &InsertPt) const;

Error importDefaultOperandRenderers(action_iterator InsertPt, RuleMatcher &M,
BuildMIAction &DstMIBuilder,
const DAGDefaultOperand &DefaultOp) const;
Error importImplicitDefRenderers(BuildMIAction &DstMIBuilder,
ArrayRef<const Record *> ImplicitDefs) const;

Expand Down Expand Up @@ -1291,7 +1289,8 @@ Error GlobalISelEmitter::importNamedNodeRenderer(

// Equivalent of MatcherGen::EmitResultLeafAsOperand.
Error GlobalISelEmitter::importLeafNodeRenderer(
RuleMatcher &M, BuildMIAction &MIBuilder, const TreePatternNode &N) const {
RuleMatcher &M, BuildMIAction &MIBuilder, const TreePatternNode &N,
action_iterator InsertPt) const {
if (const auto *II = dyn_cast<IntInit>(N.getLeafValue())) {
MIBuilder.addRenderer<ImmRenderer>(II->getValue());
return Error::success();
Expand All @@ -1300,11 +1299,29 @@ Error GlobalISelEmitter::importLeafNodeRenderer(
if (const auto *DI = dyn_cast<DefInit>(N.getLeafValue())) {
const Record *R = DI->getDef();

if (R->isSubClassOf("Register")) {
if (R->isSubClassOf("Register") || R->getName() == "zero_reg") {
MIBuilder.addRenderer<AddRegisterRenderer>(Target, R);
return Error::success();
}

if (R->getName() == "undef_tied_input") {
std::optional<LLTCodeGen> OpTyOrNone = MVTToLLT(N.getSimpleType(0));
if (!OpTyOrNone)
return failedImport("unsupported type");

unsigned TempRegID = M.allocateTempRegID();
M.insertAction<MakeTempRegisterAction>(InsertPt, *OpTyOrNone, TempRegID);

auto I = M.insertAction<BuildMIAction>(
InsertPt, M.allocateOutputInsnID(),
&Target.getInstruction(RK.getDef("IMPLICIT_DEF")));
auto &ImpDefBuilder = static_cast<BuildMIAction &>(**I);
ImpDefBuilder.addRenderer<TempRegRenderer>(TempRegID, /*IsDef=*/true);

MIBuilder.addRenderer<TempRegRenderer>(TempRegID);
return Error::success();
}

if (R->isSubClassOf("SubRegIndex")) {
const CodeGenSubRegIndex *SubRegIndex = CGRegs.getSubRegIdx(R);
MIBuilder.addRenderer<ImmRenderer>(SubRegIndex->EnumValue);
Expand Down Expand Up @@ -1386,7 +1403,7 @@ Error GlobalISelEmitter::importNodeRenderer(RuleMatcher &M,
return importNamedNodeRenderer(M, MIBuilder, N);

if (N.isLeaf())
return importLeafNodeRenderer(M, MIBuilder, N);
return importLeafNodeRenderer(M, MIBuilder, N, InsertPt);

if (N.getOperator()->isSubClassOf("SDNodeXForm"))
return importXFormNodeRenderer(M, MIBuilder, N);
Expand Down Expand Up @@ -1707,11 +1724,11 @@ Expected<action_iterator> GlobalISelEmitter::importExplicitUseRenderers(
// This is a predicate or optional def operand which the pattern has not
// overridden, or which we aren't letting it override; emit the 'default
// ops' operands.

const Record *OperandNode = DstI->Operands[InstOpNo].Rec;
if (auto Error = importDefaultOperandRenderers(
InsertPt, M, DstMIBuilder, CGP.getDefaultOperand(OperandNode)))
return std::move(Error);
for (const TreePatternNode &OpNode :
make_pointee_range(CGP.getDefaultOperand(OperandNode).DefaultOps)) {
if (Error Err = importNodeRenderer(M, DstMIBuilder, OpNode, InsertPt))
return Err;
}

++NumDefaultOps;
continue;
Expand All @@ -1734,47 +1751,6 @@ Expected<action_iterator> GlobalISelEmitter::importExplicitUseRenderers(
return InsertPt;
}

Error GlobalISelEmitter::importDefaultOperandRenderers(
action_iterator InsertPt, RuleMatcher &M, BuildMIAction &DstMIBuilder,
const DAGDefaultOperand &DefaultOp) const {
for (const auto &Op : DefaultOp.DefaultOps) {
const auto &N = *Op;
if (!N.isLeaf())
return failedImport("Could not add default op");

const auto *DefaultOp = N.getLeafValue();

if (const DefInit *DefaultDefOp = dyn_cast<DefInit>(DefaultOp)) {
std::optional<LLTCodeGen> OpTyOrNone = MVTToLLT(N.getSimpleType(0));
auto *Def = DefaultDefOp->getDef();
if (Def->getName() == "undef_tied_input") {
unsigned TempRegID = M.allocateTempRegID();
M.insertAction<MakeTempRegisterAction>(InsertPt, *OpTyOrNone,
TempRegID);
InsertPt = M.insertAction<BuildMIAction>(
InsertPt, M.allocateOutputInsnID(),
&Target.getInstruction(RK.getDef("IMPLICIT_DEF")));
BuildMIAction &IDMIBuilder =
*static_cast<BuildMIAction *>(InsertPt->get());
IDMIBuilder.addRenderer<TempRegRenderer>(TempRegID, /*IsDef=*/true);
DstMIBuilder.addRenderer<TempRegRenderer>(TempRegID);
} else {
DstMIBuilder.addRenderer<AddRegisterRenderer>(Target, Def);
}
continue;
}

if (const IntInit *DefaultIntOp = dyn_cast<IntInit>(DefaultOp)) {
DstMIBuilder.addRenderer<ImmRenderer>(DefaultIntOp->getValue());
continue;
}

return failedImport("Could not add default op");
}

return Error::success();
}

Error GlobalISelEmitter::importImplicitDefRenderers(
BuildMIAction &DstMIBuilder, ArrayRef<const Record *> ImplicitDefs) const {
if (!ImplicitDefs.empty())
Expand Down
Loading