RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-29 22:30:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add AddresSpace to PseudoSourceValue.

Browse Source 
Differential Revision: https://reviews.llvm.org/D35089

llvm-svn: 313297
This commit is contained in:
Jan Sjodin 2017-09-14 20:53:51 +00:00
parent 97d598594a
commit 242b2dcd0b
9 changed files with 86 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/llvm/CodeGen/PseudoSourceValue.h
View File

@ -25,6 +25,7 @@ namespace llvm {
class MachineFrameInfo;
class MachineMemOperand;
class raw_ostream;
class TargetInstrInfo;
raw_ostream &operator<<(raw_ostream &OS, const MachineMemOperand &MMO);
class PseudoSourceValue;
@ -48,6 +49,7 @@ public:
private:
PSVKind Kind;
unsigned AddressSpace;
friend raw_ostream &llvm::operator<<(raw_ostream &OS,
const PseudoSourceValue* PSV);
@ -58,7 +60,7 @@ private:
virtual void printCustom(raw_ostream &O) const;
public:
explicit PseudoSourceValue(PSVKind Kind);
explicit PseudoSourceValue(PSVKind Kind, const TargetInstrInfo &TII);
virtual ~PseudoSourceValue();
@ -68,6 +70,9 @@ public:
bool isGOT() const { return Kind == GOT; }
bool isConstantPool() const { return Kind == ConstantPool; }
bool isJumpTable() const { return Kind == JumpTable; }
unsigned getAddressSpace() const { return AddressSpace; }
unsigned getTargetCustom() const {
return (Kind >= TargetCustom) ? ((Kind+1) - TargetCustom) : 0;
}
@ -91,8 +96,8 @@ class FixedStackPseudoSourceValue : public PseudoSourceValue {
const int FI;
public:
explicit FixedStackPseudoSourceValue(int FI)
: PseudoSourceValue(FixedStack), FI(FI) {}
explicit FixedStackPseudoSourceValue(int FI, const TargetInstrInfo &TII)
: PseudoSourceValue(FixedStack, TII), FI(FI) {}
static bool classof(const PseudoSourceValue *V) {
return V->kind() == FixedStack;
@ -111,7 +116,7 @@ public:
class CallEntryPseudoSourceValue : public PseudoSourceValue {
protected:
CallEntryPseudoSourceValue(PSVKind Kind);
CallEntryPseudoSourceValue(PSVKind Kind, const TargetInstrInfo &TII);
public:
bool isConstant(const MachineFrameInfo *) const override;
@ -124,7 +129,8 @@ class GlobalValuePseudoSourceValue : public CallEntryPseudoSourceValue {
const GlobalValue *GV;
public:
GlobalValuePseudoSourceValue(const GlobalValue *GV);
GlobalValuePseudoSourceValue(const GlobalValue *GV,
const TargetInstrInfo &TII);
static bool classof(const PseudoSourceValue *V) {
return V->kind() == GlobalValueCallEntry;
@ -138,7 +144,7 @@ class ExternalSymbolPseudoSourceValue : public CallEntryPseudoSourceValue {
const char *ES;
public:
ExternalSymbolPseudoSourceValue(const char *ES);
ExternalSymbolPseudoSourceValue(const char *ES, const TargetInstrInfo &TII);
static bool classof(const PseudoSourceValue *V) {
return V->kind() == ExternalSymbolCallEntry;
@ -149,6 +155,7 @@ public:
/// Manages creation of pseudo source values.
class PseudoSourceValueManager {
const TargetInstrInfo &TII;
const PseudoSourceValue StackPSV, GOTPSV, JumpTablePSV, ConstantPoolPSV;
std::map<int, std::unique_ptr<FixedStackPseudoSourceValue>> FSValues;
StringMap<std::unique_ptr<const ExternalSymbolPseudoSourceValue>>
@ -158,7 +165,7 @@ class PseudoSourceValueManager {
GlobalCallEntries;
public:
PseudoSourceValueManager();
PseudoSourceValueManager(const TargetInstrInfo &TII);
/// Return a pseudo source value referencing the area below the stack frame of
/// a function, e.g., the argument space.

8
include/llvm/Target/TargetInstrInfo.h
View File

@ -25,6 +25,7 @@
#include "llvm/CodeGen/MachineInstr.h"
#include "llvm/CodeGen/MachineLoopInfo.h"
#include "llvm/CodeGen/MachineOperand.h"
#include "llvm/CodeGen/PseudoSourceValue.h"
#include "llvm/MC/MCInstrInfo.h"
#include "llvm/Support/BranchProbability.h"
#include "llvm/Support/ErrorHandling.h"
@ -1018,6 +1019,13 @@ protected:
}
public:
/// getAddressSpaceForPseudoSourceKind - Given the kind of memory
/// (e.g. stack) the target returns the corresponding address space.
virtual unsigned
getAddressSpaceForPseudoSourceKind(PseudoSourceValue::PSVKind Kind) const {
return 0;
}
/// unfoldMemoryOperand - Separate a single instruction which folded a load or
/// a store or a load and a store into two or more instruction. If this is
/// possible, returns true as well as the new instructions by reference.

4
lib/CodeGen/MachineFunction.cpp
View File

@ -147,7 +147,9 @@ void MachineFunction::init() {
"Can't create a MachineFunction using a Module with a "
"Target-incompatible DataLayout attached\n");
PSVManager = llvm::make_unique<PseudoSourceValueManager>();
PSVManager =
llvm::make_unique<PseudoSourceValueManager>(*(getSubtarget().
getInstrInfo()));
}
MachineFunction::~MachineFunction() {

6
lib/CodeGen/MachineInstr.cpp
View File

@ -579,7 +579,11 @@ LLVM_DUMP_METHOD void MachineOperand::dump() const {
/// getAddrSpace - Return the LLVM IR address space number that this pointer
/// points into.
unsigned MachinePointerInfo::getAddrSpace() const {
if (V.isNull() || V.is<const PseudoSourceValue*>()) return 0;
if (V.isNull()) return 0;
if (V.is<const PseudoSourceValue*>())
return V.get<const PseudoSourceValue*>()->getAddressSpace();
return cast<PointerType>(V.get<const Value*>()->getType())->getAddressSpace();
}

43
lib/CodeGen/PseudoSourceValue.cpp
View File

@ -14,6 +14,7 @@
#include "llvm/CodeGen/PseudoSourceValue.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/CodeGen/MachineFrameInfo.h"
#include "llvm/Target/TargetInstrInfo.h"
#include "llvm/IR/DerivedTypes.h"
#include "llvm/IR/LLVMContext.h"
#include "llvm/Support/ErrorHandling.h"
@ -24,7 +25,11 @@ static const char *const PSVNames[] = {
"Stack", "GOT", "JumpTable", "ConstantPool", "FixedStack",
"GlobalValueCallEntry", "ExternalSymbolCallEntry"};
PseudoSourceValue::PseudoSourceValue(PSVKind Kind) : Kind(Kind) {}
PseudoSourceValue::PseudoSourceValue(PSVKind Kind, const TargetInstrInfo &TII)
: Kind(Kind) {
AddressSpace = TII.getAddressSpaceForPseudoSourceKind(Kind);
}
PseudoSourceValue::~PseudoSourceValue() {}
@ -75,8 +80,9 @@ void FixedStackPseudoSourceValue::printCustom(raw_ostream &OS) const {
OS << "FixedStack" << FI;
}
CallEntryPseudoSourceValue::CallEntryPseudoSourceValue(PSVKind Kind)
: PseudoSourceValue(Kind) {}
CallEntryPseudoSourceValue::CallEntryPseudoSourceValue(
PSVKind Kind, const TargetInstrInfo &TII)
: PseudoSourceValue(Kind, TII) {}
bool CallEntryPseudoSourceValue::isConstant(const MachineFrameInfo *) const {
return false;
@ -91,16 +97,20 @@ bool CallEntryPseudoSourceValue::mayAlias(const MachineFrameInfo *) const {
}
GlobalValuePseudoSourceValue::GlobalValuePseudoSourceValue(
const GlobalValue *GV)
: CallEntryPseudoSourceValue(GlobalValueCallEntry), GV(GV) {}
const GlobalValue *GV,
const TargetInstrInfo &TII)
: CallEntryPseudoSourceValue(GlobalValueCallEntry, TII), GV(GV) {}
ExternalSymbolPseudoSourceValue::ExternalSymbolPseudoSourceValue(
const char *ES, const TargetInstrInfo &TII)
: CallEntryPseudoSourceValue(ExternalSymbolCallEntry, TII), ES(ES) {}
ExternalSymbolPseudoSourceValue::ExternalSymbolPseudoSourceValue(const char *ES)
: CallEntryPseudoSourceValue(ExternalSymbolCallEntry), ES(ES) {}
PseudoSourceValueManager::PseudoSourceValueManager()
: StackPSV(PseudoSourceValue::Stack), GOTPSV(PseudoSourceValue::GOT),
JumpTablePSV(PseudoSourceValue::JumpTable),
ConstantPoolPSV(PseudoSourceValue::ConstantPool) {}
PseudoSourceValueManager::PseudoSourceValueManager(
const TargetInstrInfo &TIInfo)
: TII(TIInfo),
StackPSV(PseudoSourceValue::Stack, TII),
GOTPSV(PseudoSourceValue::GOT, TII),
JumpTablePSV(PseudoSourceValue::JumpTable, TII),
ConstantPoolPSV(PseudoSourceValue::ConstantPool, TII) {}
const PseudoSourceValue *PseudoSourceValueManager::getStack() {
return &StackPSV;
@ -116,10 +126,11 @@ const PseudoSourceValue *PseudoSourceValueManager::getJumpTable() {
return &JumpTablePSV;
}
const PseudoSourceValue *PseudoSourceValueManager::getFixedStack(int FI) {
const PseudoSourceValue *
PseudoSourceValueManager::getFixedStack(int FI) {
std::unique_ptr<FixedStackPseudoSourceValue> &V = FSValues[FI];
if (!V)
V = llvm::make_unique<FixedStackPseudoSourceValue>(FI);
V = llvm::make_unique<FixedStackPseudoSourceValue>(FI, TII);
return V.get();
}
@ -128,7 +139,7 @@ PseudoSourceValueManager::getGlobalValueCallEntry(const GlobalValue *GV) {
std::unique_ptr<const GlobalValuePseudoSourceValue> &E =
GlobalCallEntries[GV];
if (!E)
E = llvm::make_unique<GlobalValuePseudoSourceValue>(GV);
E = llvm::make_unique<GlobalValuePseudoSourceValue>(GV, TII);
return E.get();
}
@ -137,6 +148,6 @@ PseudoSourceValueManager::getExternalSymbolCallEntry(const char *ES) {
std::unique_ptr<const ExternalSymbolPseudoSourceValue> &E =
ExternalCallEntries[ES];
if (!E)
E = llvm::make_unique<ExternalSymbolPseudoSourceValue>(ES);
E = llvm::make_unique<ExternalSymbolPseudoSourceValue>(ES, TII);
return E.get();
}

19
lib/Target/AMDGPU/SIInstrInfo.cpp
View File

@ -1873,6 +1873,25 @@ bool SIInstrInfo::isFoldableCopy(const MachineInstr &MI) const {
}
}
unsigned SIInstrInfo::getAddressSpaceForPseudoSourceKind(
PseudoSourceValue::PSVKind Kind) const {
switch(Kind) {
case PseudoSourceValue::Stack:
case PseudoSourceValue::FixedStack:
return AMDGPUASI.PRIVATE_ADDRESS;
case PseudoSourceValue::ConstantPool:
case PseudoSourceValue::GOT:
case PseudoSourceValue::JumpTable:
case PseudoSourceValue::GlobalValueCallEntry:
case PseudoSourceValue::ExternalSymbolCallEntry:
case PseudoSourceValue::TargetCustom:
return AMDGPUASI.CONSTANT_ADDRESS;
default:
return AMDGPUASI.FLAT_ADDRESS;
}
}
static void removeModOperands(MachineInstr &MI) {
unsigned Opc = MI.getOpcode();
int Src0ModIdx = AMDGPU::getNamedOperandIdx(Opc,

3
lib/Target/AMDGPU/SIInstrInfo.h
View File

@ -259,6 +259,9 @@ public:
unsigned DstReg, ArrayRef<MachineOperand> Cond,
unsigned TrueReg, unsigned FalseReg) const;
unsigned
getAddressSpaceForPseudoSourceKind(PseudoSourceValue::PSVKind Kind) const;
bool
areMemAccessesTriviallyDisjoint(MachineInstr &MIa, MachineInstr &MIb,
AliasAnalysis *AA = nullptr) const override;

2
lib/Target/AMDGPU/SIMachineFunctionInfo.cpp
View File

@ -28,6 +28,8 @@ using namespace llvm;
SIMachineFunctionInfo::SIMachineFunctionInfo(const MachineFunction &MF)
: AMDGPUMachineFunction(MF),
BufferPSV(*(MF.getSubtarget().getInstrInfo())),
ImagePSV(*(MF.getSubtarget().getInstrInfo())),
PrivateSegmentBuffer(false),
DispatchPtr(false),
QueuePtr(false),

9
lib/Target/AMDGPU/SIMachineFunctionInfo.h
View File

@ -22,6 +22,7 @@
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/CodeGen/PseudoSourceValue.h"
#include "llvm/Target/TargetInstrInfo.h"
#include "llvm/MC/MCRegisterInfo.h"
#include "llvm/Support/ErrorHandling.h"
#include <array>
@ -37,8 +38,8 @@ class TargetRegisterClass;
class AMDGPUImagePseudoSourceValue : public PseudoSourceValue {
public:
explicit AMDGPUImagePseudoSourceValue() :
PseudoSourceValue(PseudoSourceValue::TargetCustom) {}
explicit AMDGPUImagePseudoSourceValue(const TargetInstrInfo &TII) :
PseudoSourceValue(PseudoSourceValue::TargetCustom, TII) { }
bool isConstant(const MachineFrameInfo *) const override {
// This should probably be true for most images, but we will start by being
@ -61,8 +62,8 @@ public:
class AMDGPUBufferPseudoSourceValue : public PseudoSourceValue {
public:
explicit AMDGPUBufferPseudoSourceValue() :
PseudoSourceValue(PseudoSourceValue::TargetCustom) {}
explicit AMDGPUBufferPseudoSourceValue(const TargetInstrInfo &TII) :
PseudoSourceValue(PseudoSourceValue::TargetCustom, TII) { }
bool isConstant(const MachineFrameInfo *) const override {
// This should probably be true for most images, but we will start by being