RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

[MachineVerifier] Add TiedOpsRewritten flag to fix verify two-address error

Browse Source 
Summary:
Currently, MachineVerifier will attempt to verify that tied operands
satisfy register constraints as soon as the function is no longer in
SSA form. However, PHIElimination will take the function out of SSA
form while TwoAddressInstructionPass will actually rewrite tied operands
to match the constraints. PHIElimination runs first in the pipeline.
Therefore, whenever the MachineVerifier is run after PHIElimination,
it will encounter verification errors on any tied operands.

This patch adds a function property called TiedOpsRewritten that will be
set by TwoAddressInstructionPass and will control when the verifier checks
tied operands.

Reviewed By: nemanjai

Differential Revision: https://reviews.llvm.org/D80538
This commit is contained in:
Kang Zhang 2020-06-09 07:39:42 +00:00
parent 33af5ca63f
commit c5ee99bbd2
5 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/CodeGen/MachineFunction.h
View File

@ -144,6 +144,8 @@ public:
// operands, this also means that all generic virtual registers have been // operands, this also means that all generic virtual registers have been
// constrained to virtual registers (assigned to register classes) and that // constrained to virtual registers (assigned to register classes) and that
// all sizes attached to them have been eliminated. // all sizes attached to them have been eliminated.
// TiedOpsRewritten: The twoaddressinstruction pass will set this flag, it
// means that tied-def have been rewritten to meet the RegConstraint.
enum class Property : unsigned { enum class Property : unsigned {
IsSSA, IsSSA,
NoPHIs, NoPHIs,
@ -153,7 +155,8 @@ public:
Legalized, Legalized,
RegBankSelected, RegBankSelected,
Selected, Selected,
LastProperty = Selected, TiedOpsRewritten,
LastProperty = TiedOpsRewritten,
}; };
bool hasProperty(Property P) const { bool hasProperty(Property P) const {

1
lib/CodeGen/MachineFunction.cpp
View File

@ -98,6 +98,7 @@ static const char *getPropertyName(MachineFunctionProperties::Property Prop) {
case P::RegBankSelected: return "RegBankSelected"; case P::RegBankSelected: return "RegBankSelected";
case P::Selected: return "Selected"; case P::Selected: return "Selected";
case P::TracksLiveness: return "TracksLiveness"; case P::TracksLiveness: return "TracksLiveness";
case P::TiedOpsRewritten: return "TiedOpsRewritten";
} }
llvm_unreachable("Invalid machine function property"); llvm_unreachable("Invalid machine function property");
} }

13
lib/CodeGen/MachineVerifier.cpp
View File

@ -1633,10 +1633,17 @@ MachineVerifier::visitMachineOperand(const MachineOperand *MO, unsigned MONum) {
} }
} }
// Verify two-address constraints after leaving SSA form. // Verify two-address constraints after the twoaddressinstruction pass.
// Both twoaddressinstruction pass and phi-node-elimination pass call
// MRI->leaveSSA() to set MF as NoSSA, we should do the verification after
// twoaddressinstruction pass not after phi-node-elimination pass. So we
// shouldn't use the NoSSA as the condition, we should based on
// TiedOpsRewritten property to verify two-address constraints, this
// property will be set in twoaddressinstruction pass.
unsigned DefIdx; unsigned DefIdx;
if (!MRI->isSSA() && MO->isUse() && if (MF->getProperties().hasProperty(
MI->isRegTiedToDefOperand(MONum, &DefIdx) && MachineFunctionProperties::Property::TiedOpsRewritten) &&
MO->isUse() && MI->isRegTiedToDefOperand(MONum, &DefIdx) &&
Reg != MI->getOperand(DefIdx).getReg()) Reg != MI->getOperand(DefIdx).getReg())
report("Two-address instruction operands must be identical", MO, MONum); report("Two-address instruction operands must be identical", MO, MONum);

4
lib/CodeGen/TwoAddressInstructionPass.cpp
View File

@ -1687,6 +1687,10 @@ bool TwoAddressInstructionPass::runOnMachineFunction(MachineFunction &Func) {
// This pass takes the function out of SSA form. // This pass takes the function out of SSA form.
MRI->leaveSSA(); MRI->leaveSSA();
// This pass will rewrite the tied-def to meet the RegConstraint.
MF->getProperties()
.set(MachineFunctionProperties::Property::TiedOpsRewritten);
TiedOperandMap TiedOperands; TiedOperandMap TiedOperands;
for (MachineFunction::iterator MBBI = MF->begin(), MBBE = MF->end(); for (MachineFunction::iterator MBBI = MF->begin(), MBBE = MF->end();
MBBI != MBBE; ++MBBI) { MBBI != MBBE; ++MBBI) {

19
test/CodeGen/PowerPC/two-address-crash.mir
View File

@ -1,5 +1,5 @@
# RUN: not --crash llc -mtriple=ppc32-- %s -run-pass=phi-node-elimination \ # RUN: llc -mtriple=ppc32-- %s -run-pass=phi-node-elimination \
# RUN: -verify-machineinstrs -o /dev/null 2>&1 | FileCheck %s # RUN: -verify-machineinstrs -o /dev/null 2>&1
# RUN: llc -mtriple=ppc32-- %s -start-before=phi-node-elimination \ # RUN: llc -mtriple=ppc32-- %s -start-before=phi-node-elimination \
# RUN: -verify-machineinstrs -o /dev/null 2>&1 # RUN: -verify-machineinstrs -o /dev/null 2>&1
@ -89,9 +89,12 @@ body: |
... ...
# CHECK-LABEL: Bad machine code: Two-address instruction operands must be identical # Used to result in
# CHECK-NEXT: - function: VerifyTwoAddressCrash #
# CHECK-NEXT: - basic block: %bb.0 # Bad machine code: Two-address instruction operands must be identical
# CHECK-NEXT: - instruction: %10:gprc = RLWIMI killed %9:gprc(tied-def 0), killed %0:gprc, 1, 0, 30 # - function: VerifyTwoAddressCrash
# CHECK-NEXT: - operand 1: killed %9:gprc(tied-def 0) # - basic block: %bb.0
# CHECK-NEXT: LLVM ERROR: Found 1 machine code errors. # - instruction: %10:gprc = RLWIMI killed %9:gprc(tied-def 0), killed %0:gprc, 1, 0, 30
# - operand 1: killed %9:gprc(tied-def 0)
# LLVM ERROR: Found 1 machine code errors.
# Just verify that we do not crash (or get verifier error).