From 78bc2545c934a2bcaea68230aafb8153db90d3d2 Mon Sep 17 00:00:00 2001
From: Alex Lorenz <arphaman@gmail.com>
Date: Tue, 7 Jul 2015 20:34:53 +0000
Subject: [PATCH] MIR Serialization: Serialize the 'dead' register machine
operand flag.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241624 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/CodeGen/MIRParser/MILexer.cpp | 1 +
lib/CodeGen/MIRParser/MILexer.h | 3 ++-
lib/CodeGen/MIRParser/MIParser.cpp | 7 +++++-
lib/CodeGen/MIRPrinter.cpp | 2 ++
test/CodeGen/MIR/X86/dead-register-flag.mir | 26 +++++++++++++++++++++
5 files changed, 37 insertions(+), 2 deletions(-)
create mode 100644 test/CodeGen/MIR/X86/dead-register-flag.mir
diff --git a/lib/CodeGen/MIRParser/MILexer.cpp b/lib/CodeGen/MIRParser/MILexer.cpp
index 856d908b778..2d11a057046 100644
--- a/lib/CodeGen/MIRParser/MILexer.cpp
+++ b/lib/CodeGen/MIRParser/MILexer.cpp
@@ -70,6 +70,7 @@ static MIToken::TokenKind getIdentifierKind(StringRef Identifier) {
.Case("_", MIToken::underscore)
.Case("implicit", MIToken::kw_implicit)
.Case("implicit-def", MIToken::kw_implicit_define)
+ .Case("dead", MIToken::kw_dead)
.Default(MIToken::Identifier);
}
diff --git a/lib/CodeGen/MIRParser/MILexer.h b/lib/CodeGen/MIRParser/MILexer.h
index c66b2006e35..47c3c62b596 100644
--- a/lib/CodeGen/MIRParser/MILexer.h
+++ b/lib/CodeGen/MIRParser/MILexer.h
@@ -39,6 +39,7 @@ struct MIToken {
// Keywords
kw_implicit,
kw_implicit_define,
+ kw_dead,
// Identifier tokens
Identifier,
@@ -74,7 +75,7 @@ public:
}
bool isRegisterFlag() const {
- return Kind == kw_implicit || Kind == kw_implicit_define;
+ return Kind == kw_implicit || Kind == kw_implicit_define || Kind == kw_dead;
}
bool is(TokenKind K) const { return Kind == K; }
diff --git a/lib/CodeGen/MIRParser/MIParser.cpp b/lib/CodeGen/MIRParser/MIParser.cpp
index 463cc19d85e..8eefe19a408 100644
--- a/lib/CodeGen/MIRParser/MIParser.cpp
+++ b/lib/CodeGen/MIRParser/MIParser.cpp
@@ -305,6 +305,9 @@ bool MIParser::parseRegisterFlag(unsigned &Flags) {
case MIToken::kw_implicit_define:
Flags |= RegState::ImplicitDefine;
break;
+ case MIToken::kw_dead:
+ Flags |= RegState::Dead;
+ break;
// TODO: report an error when we specify the same flag more than once.
// TODO: parse the other register flags.
default:
@@ -328,7 +331,8 @@ bool MIParser::parseRegisterOperand(MachineOperand &Dest, bool IsDef) {
lex();
// TODO: Parse subregister.
Dest = MachineOperand::CreateReg(Reg, Flags & RegState::Define,
- Flags & RegState::Implicit);
+ Flags & RegState::Implicit, /*IsKill=*/false,
+ Flags & RegState::Dead);
return false;
}
@@ -412,6 +416,7 @@ bool MIParser::parseMachineOperand(MachineOperand &Dest) {
switch (Token.kind()) {
case MIToken::kw_implicit:
case MIToken::kw_implicit_define:
+ case MIToken::kw_dead:
case MIToken::underscore:
case MIToken::NamedRegister:
return parseRegisterOperand(Dest);
diff --git a/lib/CodeGen/MIRPrinter.cpp b/lib/CodeGen/MIRPrinter.cpp
index 5301df0fc4a..e02f54afd91 100644
--- a/lib/CodeGen/MIRPrinter.cpp
+++ b/lib/CodeGen/MIRPrinter.cpp
@@ -214,6 +214,8 @@ void MIPrinter::print(const MachineOperand &Op, const TargetRegisterInfo *TRI) {
// TODO: Print the other register flags.
if (Op.isImplicit())
OS << (Op.isDef() ? "implicit-def " : "implicit ");
+ if (Op.isDead())
+ OS << "dead ";
printReg(Op.getReg(), OS, TRI);
// TODO: Print sub register.
break;
diff --git a/test/CodeGen/MIR/X86/dead-register-flag.mir b/test/CodeGen/MIR/X86/dead-register-flag.mir
new file mode 100644
index 00000000000..988b554659c
--- /dev/null
+++ b/test/CodeGen/MIR/X86/dead-register-flag.mir
@@ -0,0 +1,26 @@
+# RUN: llc -march=x86-64 -start-after branch-folder -stop-after branch-folder -o /dev/null %s | FileCheck %s
+# This test ensures that the MIR parser parses the 'dead' register flags
+# correctly.
+
+--- |
+
+ define i32 @foo(i32 %a) #0 {
+ body:
+ %c = mul i32 %a, 11
+ ret i32 %c
+ }
+
+ attributes #0 = { "no-frame-pointer-elim"="false" }
+
+...
+---
+name: foo
+body:
+ # CHECK: name: body
+ - id: 0
+ name: body
+ instructions:
+ # CHECK: - '%eax = IMUL32rri8 %edi, 11, implicit-def dead %eflags'
+ - '%eax = IMUL32rri8 %edi, 11, implicit-def dead %eflags'
+ - 'RETQ %eax'
+...