MIR Serialization: Serialize the 'invariant' machine memory operand flag.

llvm-svn: 244230
This commit is contained in:
Alex Lorenz 2015-08-06 16:55:53 +00:00
parent bd753c9315
commit dc8de2a6b7
5 changed files with 34 additions and 3 deletions

View File

@ -176,6 +176,7 @@ static MIToken::TokenKind getIdentifierKind(StringRef Identifier) {
.Case("target-flags", MIToken::kw_target_flags) .Case("target-flags", MIToken::kw_target_flags)
.Case("volatile", MIToken::kw_volatile) .Case("volatile", MIToken::kw_volatile)
.Case("non-temporal", MIToken::kw_non_temporal) .Case("non-temporal", MIToken::kw_non_temporal)
.Case("invariant", MIToken::kw_invariant)
.Default(MIToken::Identifier); .Default(MIToken::Identifier);
} }

View File

@ -68,6 +68,7 @@ struct MIToken {
kw_target_flags, kw_target_flags,
kw_volatile, kw_volatile,
kw_non_temporal, kw_non_temporal,
kw_invariant,
// Identifier tokens // Identifier tokens
Identifier, Identifier,
@ -130,7 +131,8 @@ public:
} }
bool isMemoryOperandFlag() const { bool isMemoryOperandFlag() const {
return Kind == kw_volatile || Kind == kw_non_temporal; return Kind == kw_volatile || Kind == kw_non_temporal ||
Kind == kw_invariant;
} }
bool is(TokenKind K) const { return Kind == K; } bool is(TokenKind K) const { return Kind == K; }

View File

@ -1066,8 +1066,11 @@ bool MIParser::parseMemoryOperandFlag(unsigned &Flags) {
case MIToken::kw_non_temporal: case MIToken::kw_non_temporal:
Flags |= MachineMemOperand::MONonTemporal; Flags |= MachineMemOperand::MONonTemporal;
break; break;
case MIToken::kw_invariant:
Flags |= MachineMemOperand::MOInvariant;
break;
// TODO: report an error when we specify the same flag more than once. // TODO: report an error when we specify the same flag more than once.
// TODO: parse the other memory operand flags. // TODO: parse the target specific memory operand flags.
default: default:
llvm_unreachable("The current token should be a memory operand flag"); llvm_unreachable("The current token should be a memory operand flag");
} }

View File

@ -652,11 +652,13 @@ void MIPrinter::print(const MachineOperand &Op, const TargetRegisterInfo *TRI) {
void MIPrinter::print(const MachineMemOperand &Op) { void MIPrinter::print(const MachineMemOperand &Op) {
OS << '('; OS << '(';
// TODO: Print operand's other flags. // TODO: Print operand's target specific flags.
if (Op.isVolatile()) if (Op.isVolatile())
OS << "volatile "; OS << "volatile ";
if (Op.isNonTemporal()) if (Op.isNonTemporal())
OS << "non-temporal "; OS << "non-temporal ";
if (Op.isInvariant())
OS << "invariant ";
if (Op.isLoad()) if (Op.isLoad())
OS << "load "; OS << "load ";
else { else {

View File

@ -35,6 +35,14 @@
!0 = !{i32 1} !0 = !{i32 1}
define i32 @invariant_load(i32* %x) {
entry:
%v = load i32, i32* %x, !invariant.load !1
ret i32 %v
}
!1 = !{}
... ...
--- ---
name: test name: test
@ -100,3 +108,18 @@ body:
- 'MOVNTImr killed %rdi, 1, _, 0, _, killed %esi :: (non-temporal store 4 into %ir.a)' - 'MOVNTImr killed %rdi, 1, _, 0, _, killed %esi :: (non-temporal store 4 into %ir.a)'
- RETQ - RETQ
... ...
---
name: invariant_load
tracksRegLiveness: true
liveins:
- { reg: '%rdi' }
body:
- id: 0
name: entry
liveins: [ '%rdi' ]
instructions:
# CHECK: name: invariant_load
# CHECK: %eax = MOV32rm killed %rdi, 1, _, 0, _ :: (invariant load 4 from %ir.x)
- '%eax = MOV32rm killed %rdi, 1, _, 0, _ :: (invariant load 4 from %ir.x)'
- 'RETQ %eax'
...