[llvm] r244075 - MIR Serialization: Serialize the 'early-clobber' register operand flag.

[Alex Lorenz]

Author: arphaman
Date: Wed Aug  5 12:49:03 2015
New Revision: 244075

URL: http://llvm.org/viewvc/llvm-project?rev=244075&view=rev
Log:
MIR Serialization: Serialize the 'early-clobber' register operand flag.

Added:
    llvm/trunk/test/CodeGen/MIR/X86/early-clobber-register-flag.mir
Modified:
    llvm/trunk/lib/CodeGen/MIRParser/MILexer.cpp
    llvm/trunk/lib/CodeGen/MIRParser/MILexer.h
    llvm/trunk/lib/CodeGen/MIRParser/MIParser.cpp
    llvm/trunk/lib/CodeGen/MIRPrinter.cpp

Modified: llvm/trunk/lib/CodeGen/MIRParser/MILexer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MIRParser/MILexer.cpp?rev=244075&r1=244074&r2=244075&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MIRParser/MILexer.cpp (original)
+++ llvm/trunk/lib/CodeGen/MIRParser/MILexer.cpp Wed Aug  5 12:49:03 2015
@@ -146,6 +146,7 @@ static MIToken::TokenKind getIdentifierK
       .Case("dead", MIToken::kw_dead)
       .Case("killed", MIToken::kw_killed)
       .Case("undef", MIToken::kw_undef)
+      .Case("early-clobber", MIToken::kw_early_clobber)
       .Case("debug-use", MIToken::kw_debug_use)
       .Case("frame-setup", MIToken::kw_frame_setup)
       .Case("debug-location", MIToken::kw_debug_location)

Modified: llvm/trunk/lib/CodeGen/MIRParser/MILexer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MIRParser/MILexer.h?rev=244075&r1=244074&r2=244075&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MIRParser/MILexer.h (original)
+++ llvm/trunk/lib/CodeGen/MIRParser/MILexer.h Wed Aug  5 12:49:03 2015
@@ -47,6 +47,7 @@ struct MIToken {
     kw_dead,
     kw_killed,
     kw_undef,
+    kw_early_clobber,
     kw_debug_use,
     kw_frame_setup,
     kw_debug_location,
@@ -120,7 +121,7 @@ public:
   bool isRegisterFlag() const {
     return Kind == kw_implicit || Kind == kw_implicit_define ||
            Kind == kw_dead || Kind == kw_killed || Kind == kw_undef ||
-           Kind == kw_debug_use;
+           Kind == kw_early_clobber || Kind == kw_debug_use;
   }
 
   bool isMemoryOperandFlag() const { return Kind == kw_volatile; }

Modified: llvm/trunk/lib/CodeGen/MIRParser/MIParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MIRParser/MIParser.cpp?rev=244075&r1=244074&r2=244075&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MIRParser/MIParser.cpp (original)
+++ llvm/trunk/lib/CodeGen/MIRParser/MIParser.cpp Wed Aug  5 12:49:03 2015
@@ -490,6 +490,9 @@ bool MIParser::parseRegisterFlag(unsigne
   case MIToken::kw_undef:
     Flags |= RegState::Undef;
     break;
+  case MIToken::kw_early_clobber:
+    Flags |= RegState::EarlyClobber;
+    break;
   case MIToken::kw_debug_use:
     Flags |= RegState::Debug;
     break;
@@ -535,7 +538,7 @@ bool MIParser::parseRegisterOperand(Mach
   Dest = MachineOperand::CreateReg(
       Reg, Flags & RegState::Define, Flags & RegState::Implicit,
       Flags & RegState::Kill, Flags & RegState::Dead, Flags & RegState::Undef,
-      /*isEarlyClobber=*/false, SubReg, Flags & RegState::Debug);
+      Flags & RegState::EarlyClobber, SubReg, Flags & RegState::Debug);
   return false;
 }
 
@@ -885,6 +888,7 @@ bool MIParser::parseMachineOperand(Machi
   case MIToken::kw_dead:
   case MIToken::kw_killed:
   case MIToken::kw_undef:
+  case MIToken::kw_early_clobber:
   case MIToken::kw_debug_use:
   case MIToken::underscore:
   case MIToken::NamedRegister:

Modified: llvm/trunk/lib/CodeGen/MIRPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MIRPrinter.cpp?rev=244075&r1=244074&r2=244075&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MIRPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/MIRPrinter.cpp Wed Aug  5 12:49:03 2015
@@ -529,6 +529,8 @@ void MIPrinter::print(const MachineOpera
       OS << "killed ";
     if (Op.isUndef())
       OS << "undef ";
+    if (Op.isEarlyClobber())
+      OS << "early-clobber ";
     if (Op.isDebug())
       OS << "debug-use ";
     printReg(Op.getReg(), OS, TRI);

Added: llvm/trunk/test/CodeGen/MIR/X86/early-clobber-register-flag.mir
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/MIR/X86/early-clobber-register-flag.mir?rev=244075&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/MIR/X86/early-clobber-register-flag.mir (added)
+++ llvm/trunk/test/CodeGen/MIR/X86/early-clobber-register-flag.mir Wed Aug  5 12:49:03 2015
@@ -0,0 +1,46 @@
+# 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 'early-clobber' register
+# flags correctly.
+
+--- |
+
+  declare void @foo(i32)
+
+  define void @test(i32 %a, i32 %b) #0 {
+  entry:
+    %c = add i32 %a, %b
+    call void asm sideeffect "nop", "~{ax},~{di}"()
+    call void @foo(i32 %c)
+    ret void
+  }
+
+  attributes #0 = { optsize }
+
+...
+---
+name:            test
+hasInlineAsm:    true
+tracksRegLiveness: true
+liveins:
+  - { reg: '%edi' }
+  - { reg: '%esi' }
+frameInfo:
+  stackSize:     8
+  adjustsStack:  true
+  hasCalls:      true
+body:
+  - id:          0
+    name:        entry
+    liveins:     [ '%edi', '%esi' ]
+    instructions:
+      - 'frame-setup PUSH64r undef %rax, implicit-def %rsp, implicit %rsp'
+      - CFI_INSTRUCTION .cfi_def_cfa_offset 16
+      - '%ecx = COPY %edi'
+      - '%ecx = ADD32rr killed %ecx, killed %esi, implicit-def dead %eflags'
+# CHECK: INLINEASM $nop, 1, 12, implicit-def dead early-clobber %ax, 12, implicit-def dead early-clobber %di
+      - 'INLINEASM $nop, 1, 12, implicit-def dead early-clobber %ax, 12, implicit-def dead early-clobber %di'
+      - '%edi = COPY killed %ecx'
+      - 'CALL64pcrel32 @foo, csr_64, implicit %rsp, implicit %edi, implicit-def %rsp'
+      - '%rax = POP64r implicit-def %rsp, implicit %rsp'
+      - RETQ
+...