From ac57f351bdb4bcbfbf226aa7eb4a9843a467fa96 Mon Sep 17 00:00:00 2001 From: Alex Lorenz Date: Tue, 23 Jun 2015 23:42:28 +0000 Subject: [PATCH] MIR Serialization: Serialize immediate machine operands. Reviewers: Duncan P. N. Exon Smith Differential Revision: http://reviews.llvm.org/D10573 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240481 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/MIRParser/MILexer.cpp | 14 +++++++- lib/CodeGen/MIRParser/MILexer.h | 12 ++++++- lib/CodeGen/MIRParser/MIParser.cpp | 14 ++++++++ lib/CodeGen/MIRPrinter.cpp | 3 ++ test/CodeGen/MIR/X86/immediate-operands.mir | 38 +++++++++++++++++++++ 5 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 test/CodeGen/MIR/X86/immediate-operands.mir diff --git a/lib/CodeGen/MIRParser/MILexer.cpp b/lib/CodeGen/MIRParser/MILexer.cpp index 1cc5956d9fb..b836221d9f0 100644 --- a/lib/CodeGen/MIRParser/MILexer.cpp +++ b/lib/CodeGen/MIRParser/MILexer.cpp @@ -33,7 +33,7 @@ public: bool isEOF() const { return Ptr == End; } - char peek() const { return isEOF() ? 0 : *Ptr; } + char peek(unsigned I = 0) const { return End - Ptr <= I ? 0 : Ptr[I]; } void advance() { ++Ptr; } @@ -77,6 +77,16 @@ static Cursor lexPercent(Cursor C, MIToken &Token) { return C; } +static Cursor lexIntegerLiteral(Cursor C, MIToken &Token) { + auto Range = C; + C.advance(); + while (isdigit(C.peek())) + C.advance(); + StringRef StrVal = Range.upto(C); + Token = MIToken(MIToken::IntegerLiteral, StrVal, APSInt(StrVal)); + return C; +} + static MIToken::TokenKind symbolToken(char C) { switch (C) { case ',': @@ -109,6 +119,8 @@ StringRef llvm::lexMIToken( return lexIdentifier(C, Token).remaining(); if (Char == '%') return lexPercent(C, Token).remaining(); + if (isdigit(Char) || (Char == '-' && isdigit(C.peek(1)))) + return lexIntegerLiteral(C, Token).remaining(); MIToken::TokenKind Kind = symbolToken(Char); if (Kind != MIToken::Error) return lexSymbol(C, Kind, Token).remaining(); diff --git a/lib/CodeGen/MIRParser/MILexer.h b/lib/CodeGen/MIRParser/MILexer.h index 24cbf7d72f3..df8b6cb2026 100644 --- a/lib/CodeGen/MIRParser/MILexer.h +++ b/lib/CodeGen/MIRParser/MILexer.h @@ -15,6 +15,7 @@ #ifndef LLVM_LIB_CODEGEN_MIRPARSER_MILEXER_H #define LLVM_LIB_CODEGEN_MIRPARSER_MILEXER_H +#include "llvm/ADT/APSInt.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/STLExtras.h" #include @@ -36,16 +37,23 @@ struct MIToken { // Identifier tokens Identifier, - NamedRegister + NamedRegister, + + // Other tokens + IntegerLiteral }; private: TokenKind Kind; StringRef Range; + APSInt IntVal; public: MIToken(TokenKind Kind, StringRef Range) : Kind(Kind), Range(Range) {} + MIToken(TokenKind Kind, StringRef Range, const APSInt &IntVal) + : Kind(Kind), Range(Range), IntVal(IntVal) {} + TokenKind kind() const { return Kind; } bool isError() const { return Kind == Error; } @@ -59,6 +67,8 @@ public: StringRef::iterator location() const { return Range.begin(); } StringRef stringValue() const { return Range; } + + const APSInt &integerValue() const { return IntVal; } }; /// Consume a single machine instruction token in the given source and return diff --git a/lib/CodeGen/MIRParser/MIParser.cpp b/lib/CodeGen/MIRParser/MIParser.cpp index 029732a853e..33f306945cb 100644 --- a/lib/CodeGen/MIRParser/MIParser.cpp +++ b/lib/CodeGen/MIRParser/MIParser.cpp @@ -57,6 +57,7 @@ public: bool parseRegister(unsigned &Reg); bool parseRegisterOperand(MachineOperand &Dest, bool IsDef = false); + bool parseImmediateOperand(MachineOperand &Dest); bool parseMachineOperand(MachineOperand &Dest); private: @@ -197,10 +198,23 @@ bool MIParser::parseRegisterOperand(MachineOperand &Dest, bool IsDef) { return false; } +bool MIParser::parseImmediateOperand(MachineOperand &Dest) { + assert(Token.is(MIToken::IntegerLiteral)); + const APSInt &Int = Token.integerValue(); + if (Int.getMinSignedBits() > 64) + // TODO: Replace this with an error when we can parse CIMM Machine Operands. + llvm_unreachable("Can't parse large integer literals yet!"); + Dest = MachineOperand::CreateImm(Int.getExtValue()); + lex(); + return false; +} + bool MIParser::parseMachineOperand(MachineOperand &Dest) { switch (Token.kind()) { case MIToken::NamedRegister: return parseRegisterOperand(Dest); + case MIToken::IntegerLiteral: + return parseImmediateOperand(Dest); case MIToken::Error: return true; default: diff --git a/lib/CodeGen/MIRPrinter.cpp b/lib/CodeGen/MIRPrinter.cpp index 5dd38cf9491..6d62b0ad85b 100644 --- a/lib/CodeGen/MIRPrinter.cpp +++ b/lib/CodeGen/MIRPrinter.cpp @@ -159,6 +159,9 @@ void MIPrinter::print(const MachineOperand &Op, const TargetRegisterInfo *TRI) { printReg(Op.getReg(), OS, TRI); // TODO: Print sub register. break; + case MachineOperand::MO_Immediate: + OS << Op.getImm(); + break; default: // TODO: Print the other machine operands. llvm_unreachable("Can't print this machine operand at the moment"); diff --git a/test/CodeGen/MIR/X86/immediate-operands.mir b/test/CodeGen/MIR/X86/immediate-operands.mir new file mode 100644 index 00000000000..6cb3152e7e4 --- /dev/null +++ b/test/CodeGen/MIR/X86/immediate-operands.mir @@ -0,0 +1,38 @@ +# 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 immediate machine operands. + +--- | + + define i32 @foo() { + entry: + ret i32 42 + } + + define i32 @bar() { + entry: + ret i32 -11 + } + +... +--- +# CHECK: name: foo +name: foo +body: + - name: entry + instructions: + # CHECK: - '%eax = MOV32ri 42' + # CHECK-NEXT: - 'RETQ %eax' + - '%eax = MOV32ri 42' + - 'RETQ %eax' +... +--- +# CHECK: name: bar +name: bar +body: + - name: entry + instructions: + # CHECK: - '%eax = MOV32ri -11' + # CHECK-NEXT: - 'RETQ %eax' + - '%eax = MOV32ri -11' + - 'RETQ %eax' +... -- 2.34.1