[VE] Add alternative names to registers

Summary:
VE uses identical names "%s0-63" to all generic registers.  Change to use
alternative name mechanism among all generic registers instead of hard-
coding them.

Reviewed By: arsenm

Differential Revision: https://reviews.llvm.org/D78174
This commit is contained in:
Kazushi (Jam) Marukawa 2020-04-22 09:07:28 +02:00 committed by Simon Moll
parent 05a11974ae
commit ba4162c1c4
3 changed files with 29 additions and 17 deletions

View File

@ -36,7 +36,9 @@ using namespace VE;
#include "VEGenAsmWriter.inc" #include "VEGenAsmWriter.inc"
void VEInstPrinter::printRegName(raw_ostream &OS, unsigned RegNo) const { void VEInstPrinter::printRegName(raw_ostream &OS, unsigned RegNo) const {
OS << '%' << StringRef(getRegisterName(RegNo)).lower(); // Generic registers have identical register name among register classes.
unsigned AltIdx = VE::AsmName;
OS << '%' << getRegisterName(RegNo, AltIdx);
} }
void VEInstPrinter::printInst(const MCInst *MI, uint64_t Address, void VEInstPrinter::printInst(const MCInst *MI, uint64_t Address,

View File

@ -13,6 +13,7 @@
#ifndef LLVM_LIB_TARGET_VE_INSTPRINTER_VEINSTPRINTER_H #ifndef LLVM_LIB_TARGET_VE_INSTPRINTER_VEINSTPRINTER_H
#define LLVM_LIB_TARGET_VE_INSTPRINTER_VEINSTPRINTER_H #define LLVM_LIB_TARGET_VE_INSTPRINTER_VEINSTPRINTER_H
#include "VEMCTargetDesc.h"
#include "llvm/MC/MCInstPrinter.h" #include "llvm/MC/MCInstPrinter.h"
namespace llvm { namespace llvm {
@ -32,7 +33,8 @@ public:
const MCSubtargetInfo &, raw_ostream &); const MCSubtargetInfo &, raw_ostream &);
void printInstruction(const MCInst *, uint64_t, const MCSubtargetInfo &, void printInstruction(const MCInst *, uint64_t, const MCSubtargetInfo &,
raw_ostream &); raw_ostream &);
static const char *getRegisterName(unsigned RegNo); static const char *getRegisterName(unsigned RegNo,
unsigned AltIdx = VE::NoRegAltName);
void printOperand(const MCInst *MI, int OpNum, const MCSubtargetInfo &STI, void printOperand(const MCInst *MI, int OpNum, const MCSubtargetInfo &STI,
raw_ostream &OS); raw_ostream &OS);

View File

@ -10,10 +10,14 @@
// Declarations that describe the VE register file // Declarations that describe the VE register file
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
class VEReg<bits<7> Enc, string n> : Register<n> { class VEReg<bits<7> enc, string n, list<Register> subregs = [],
list<string> altNames = [], list<Register> aliases = []>
: Register<n, altNames> {
let HWEncoding{15-7} = 0; let HWEncoding{15-7} = 0;
let HWEncoding{6-0} = Enc; let HWEncoding{6-0} = enc;
let Namespace = "VE"; let Namespace = "VE";
let SubRegs = subregs;
let Aliases = aliases;
} }
let Namespace = "VE" in { let Namespace = "VE" in {
@ -21,41 +25,45 @@ let Namespace = "VE" in {
def sub_i16 : SubRegIndex<16, 48>; // Low 16 bit (48..63) def sub_i16 : SubRegIndex<16, 48>; // Low 16 bit (48..63)
def sub_i32 : SubRegIndex<32, 32>; // Low 32 bit (32..63) def sub_i32 : SubRegIndex<32, 32>; // Low 32 bit (32..63)
def sub_f32 : SubRegIndex<32>; // High 32 bit (0..31) def sub_f32 : SubRegIndex<32>; // High 32 bit (0..31)
def AsmName : RegAltNameIndex;
} }
// Registers are identified with 7-bit ID numbers. //-----------------------------------------------------------------------------
// R - 64-bit integer or floating-point registers // Gneric Registers
class R<bits<7> Enc, string n, list<Register> subregs = [], //-----------------------------------------------------------------------------
list<Register> aliases = []>: VEReg<Enc, n> {
let SubRegs = subregs; let RegAltNameIndices = [AsmName] in {
let Aliases = aliases;
}
// Generic integer registers - 8 bits wide // Generic integer registers - 8 bits wide
foreach I = 0-63 in foreach I = 0-63 in
def SB#I : R<I, "S"#I>, DwarfRegNum<[I]>; def SB#I : VEReg<I, "sb"#I, [], ["s"#I]>, DwarfRegNum<[I]>;
// Generic integer registers - 16 bits wide // Generic integer registers - 16 bits wide
let SubRegIndices = [sub_i8] in let SubRegIndices = [sub_i8] in
foreach I = 0-63 in foreach I = 0-63 in
def SH#I : R<I, "S"#I, [!cast<R>("SB"#I)]>, DwarfRegNum<[I]>; def SH#I : VEReg<I, "sh"#I, [!cast<VEReg>("SB"#I)], ["s"#I]>,
DwarfRegNum<[I]>;
// Generic integer registers - 32 bits wide // Generic integer registers - 32 bits wide
let SubRegIndices = [sub_i16] in let SubRegIndices = [sub_i16] in
foreach I = 0-63 in foreach I = 0-63 in
def SW#I : R<I, "S"#I, [!cast<R>("SH"#I)]>, DwarfRegNum<[I]>; def SW#I : VEReg<I, "sw"#I, [!cast<VEReg>("SH"#I)], ["s"#I]>,
DwarfRegNum<[I]>;
// Generic floating point registers - 32 bits wide // Generic floating point registers - 32 bits wide
// NOTE: Mark SF#I as alias of SW#I temporary to avoid register allocation // NOTE: Mark SF#I as alias of SW#I temporary to avoid register allocation
// problem. // problem.
foreach I = 0-63 in foreach I = 0-63 in
def SF#I : R<I, "S"#I, [], [!cast<R>("SW"#I)]>, DwarfRegNum<[I]>; def SF#I : VEReg<I, "sf"#I, [], ["s"#I], [!cast<VEReg>("SW"#I)]>,
DwarfRegNum<[I]>;
// Generic integer registers - 64 bits wide // Generic integer registers - 64 bits wide
let SubRegIndices = [sub_i32, sub_f32], CoveredBySubRegs = 1 in let SubRegIndices = [sub_i32, sub_f32], CoveredBySubRegs = 1 in
foreach I = 0-63 in foreach I = 0-63 in
def SX#I : R<I, "S"#I, [!cast<R>("SW"#I), !cast<R>("SF"#I)]>, def SX#I : VEReg<I, "s"#I, [!cast<VEReg>("SW"#I), !cast<VEReg>("SF"#I)],
DwarfRegNum<[I]>; ["s"#I]>, DwarfRegNum<[I]>;
} // RegAltNameIndices = [AsmName]
// Register classes. // Register classes.
// //