5022f6bb81
This commit modifies the way the machine basic blocks are serialized - now the
machine basic blocks are serialized using a custom syntax instead of relying on
YAML primitives. Instead of using YAML mappings to represent the individual
machine basic blocks in a machine function's body, the new syntax uses a single
YAML block scalar which contains all of the machine basic blocks and
instructions for that function.
This is an example of a function's body that uses the old syntax:
body:
- id: 0
name: entry
instructions:
- '%eax = MOV32r0 implicit-def %eflags'
- 'RETQ %eax'
...
The same body is now written like this:
body: |
bb.0.entry:
%eax = MOV32r0 implicit-def %eflags
RETQ %eax
...
This syntax change is motivated by the fact that the bundled machine
instructions didn't map that well to the old syntax which was using a single
YAML sequence to store all of the machine instructions in a block. The bundled
machine instructions internally use flags like BundledPred and BundledSucc to
determine the bundles, and serializing them as MI flags using the old syntax
would have had a negative impact on the readability and the ease of editing
for MIR files. The new syntax allows me to serialize the bundled machine
instructions using a block construct without relying on the internal flags,
for example:
BUNDLE implicit-def dead %itstate, implicit-def %s1 ... {
t2IT 1, 24, implicit-def %itstate
%s1 = VMOVS killed %s0, 1, killed %cpsr, implicit killed %itstate
}
This commit also converts the MIR testcases to the new syntax. I developed
a script that can convert from the old syntax to the new one. I will post the
script on the llvm-commits mailing list in the thread for this commit.
llvm-svn: 244982
90 lines
3.5 KiB
C++
90 lines
3.5 KiB
C++
//===- MIParser.h - Machine Instructions Parser ---------------------------===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This file declares the function that parses the machine instructions.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef LLVM_LIB_CODEGEN_MIRPARSER_MIPARSER_H
|
|
#define LLVM_LIB_CODEGEN_MIRPARSER_MIPARSER_H
|
|
|
|
#include "llvm/ADT/DenseMap.h"
|
|
#include "llvm/ADT/StringRef.h"
|
|
|
|
namespace llvm {
|
|
|
|
class BasicBlock;
|
|
class MachineBasicBlock;
|
|
class MachineInstr;
|
|
class MachineFunction;
|
|
struct SlotMapping;
|
|
class SMDiagnostic;
|
|
class SourceMgr;
|
|
|
|
struct PerFunctionMIParsingState {
|
|
DenseMap<unsigned, MachineBasicBlock *> MBBSlots;
|
|
DenseMap<unsigned, unsigned> VirtualRegisterSlots;
|
|
DenseMap<unsigned, int> FixedStackObjectSlots;
|
|
DenseMap<unsigned, int> StackObjectSlots;
|
|
DenseMap<unsigned, unsigned> ConstantPoolSlots;
|
|
DenseMap<unsigned, unsigned> JumpTableSlots;
|
|
};
|
|
|
|
/// Parse the machine basic block definitions, and skip the machine
|
|
/// instructions.
|
|
///
|
|
/// This function runs the first parsing pass on the machine function's body.
|
|
/// It parses only the machine basic block definitions and creates the machine
|
|
/// basic blocks in the given machine function.
|
|
///
|
|
/// The machine instructions aren't parsed during the first pass because all
|
|
/// the machine basic blocks aren't defined yet - this makes it impossible to
|
|
/// resolve the machine basic block references.
|
|
///
|
|
/// Return true if an error occurred.
|
|
bool parseMachineBasicBlockDefinitions(MachineFunction &MF, StringRef Src,
|
|
PerFunctionMIParsingState &PFS,
|
|
const SlotMapping &IRSlots,
|
|
SMDiagnostic &Error);
|
|
|
|
/// Parse the machine instructions.
|
|
///
|
|
/// This function runs the second parsing pass on the machine function's body.
|
|
/// It skips the machine basic block definitions and parses only the machine
|
|
/// instructions and basic block attributes like liveins and successors.
|
|
///
|
|
/// The second parsing pass assumes that the first parsing pass already ran
|
|
/// on the given source string.
|
|
///
|
|
/// Return true if an error occurred.
|
|
bool parseMachineInstructions(MachineFunction &MF, StringRef Src,
|
|
const PerFunctionMIParsingState &PFS,
|
|
const SlotMapping &IRSlots, SMDiagnostic &Error);
|
|
|
|
bool parseMBBReference(MachineBasicBlock *&MBB, SourceMgr &SM,
|
|
MachineFunction &MF, StringRef Src,
|
|
const PerFunctionMIParsingState &PFS,
|
|
const SlotMapping &IRSlots, SMDiagnostic &Error);
|
|
|
|
bool parseNamedRegisterReference(unsigned &Reg, SourceMgr &SM,
|
|
MachineFunction &MF, StringRef Src,
|
|
const PerFunctionMIParsingState &PFS,
|
|
const SlotMapping &IRSlots,
|
|
SMDiagnostic &Error);
|
|
|
|
bool parseVirtualRegisterReference(unsigned &Reg, SourceMgr &SM,
|
|
MachineFunction &MF, StringRef Src,
|
|
const PerFunctionMIParsingState &PFS,
|
|
const SlotMapping &IRSlots,
|
|
SMDiagnostic &Error);
|
|
|
|
} // end namespace llvm
|
|
|
|
#endif
|