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

Revert "[MCA] Adding the CustomBehaviour class to llvm-mca"

Browse Source 
This reverts commit f7a23ecece524564a0c3e09787142cc6061027bb.

It appears to breaks buildbots that don't build the AMDGPU backend.
This commit is contained in:
Andrea Di Biagio 2021-06-15 21:34:41 +01:00
parent e52d4f2208
commit f1dc7da2e3
18 changed files with 18 additions and 488 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
docs/CommandGuide/llvm-mca.rst
View File

@ -212,11 +212,6 @@ option specifies "``-``", then the output will also be sent to standard output.
Print the requested views in JSON format. The instructions and the processor
resources are printed as members of special top level JSON objects. The
individual views refer to them by index.
.. option:: -disable-cb
Force usage of the generic CustomBehaviour class rather than using the target
specific class. The generic class never detects any custom hazards.
EXIT STATUS
@ -983,32 +978,3 @@ Once issued, an instruction is moved to ``IssuedInst`` set until it is ready to
retire. :program:`llvm-mca` ensures that writes are committed in-order. However,
an instruction is allowed to commit writes and retire out-of-order if
``RetireOOO`` property is true for at least one of its writes.
Custom Behaviour
""""""""""""""""""""""""""""""""""""
Due to certain instructions not being expressed perfectly within their
scheduling model, :program:`llvm-ma` isn't always able to simulate them
perfectly. Modifying the scheduling model isn't always a viable
option though (maybe because the instruction is modeled incorrectly on
purpose or the instruction's behaviour is quite complex). The
CustomBehaviour class can be used in these cases to enforce proper
instruction modeling (often by customizing data dependencies and detecting
hazards that :program:`llvm-ma` has no way of knowing about).
:program:`llvm-mca` comes with one generic and multiple target specific
CustomBehaviour classes. The generic class will be used if the ``-disable-cb``
flag is used or if a target specific CustomBehaviour class doesn't exist for
that target. (The generic class does nothing.) Currently, the CustomBehaviour
class is only a part of the in-order pipeline, but there are plans to add it
to the out-of-order pipeline in the future.
CustomBehaviour's main method is `checkCustomHazard()` which uses the
current instruction and a list of all instructions still executing within
the pipeline to determine if the current instruction should be dispatched.
As output, the method returns an integer representing the number of cycles
that the current instruction must stall for (this can be an underestimate
if you don't know the exact number and a value of 0 represents no stall).
If you'd like to add a CustomBehaviour class for a target that doesn't
already have one, refer to an existing implementation to see how to set it
up. Remember to look at (and add to) `/llvm-mca/lib/CMakeLists.txt`.

7
include/llvm/MCA/Context.h
View File

@ -19,7 +19,6 @@
#include "llvm/MC/MCRegisterInfo.h"
#include "llvm/MC/MCSubtargetInfo.h"
#include "llvm/MCA/CustomBehaviour.h"
#include "llvm/MCA/HardwareUnits/HardwareUnit.h"
#include "llvm/MCA/Pipeline.h"
#include "llvm/MCA/SourceMgr.h"
@ -68,14 +67,12 @@ public:
/// Construct a basic pipeline for simulating an out-of-order pipeline.
/// This pipeline consists of Fetch, Dispatch, Execute, and Retire stages.
std::unique_ptr<Pipeline> createDefaultPipeline(const PipelineOptions &Opts,
SourceMgr &SrcMgr,
CustomBehaviour &CB);
SourceMgr &SrcMgr);
/// Construct a basic pipeline for simulating an in-order pipeline.
/// This pipeline consists of Fetch, InOrderIssue, and Retire stages.
std::unique_ptr<Pipeline> createInOrderPipeline(const PipelineOptions &Opts,
SourceMgr &SrcMgr,
CustomBehaviour &CB);
SourceMgr &SrcMgr);
};
} // namespace mca

86
include/llvm/MCA/CustomBehaviour.h
View File

@ -1,86 +0,0 @@
//===---------------------- CustomBehaviour.h -------------------*- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
/// \file
///
/// This file defines the base class CustomBehaviour which can be inherited from
/// by specific targets (ex. llvm/tools/llvm-mca/lib/X86CustomBehaviour.h).
/// CustomBehaviour is designed to enforce custom behaviour and dependencies
/// within the llvm-mca pipeline simulation that llvm-mca isn't already capable
/// of extracting from the Scheduling Models.
///
//===----------------------------------------------------------------------===//
#ifndef LLVM_MCA_CUSTOMBEHAVIOUR_H
#define LLVM_MCA_CUSTOMBEHAVIOUR_H
#include "llvm/MC/MCInst.h"
#include "llvm/MC/MCInstrInfo.h"
#include "llvm/MC/MCSubtargetInfo.h"
#include "llvm/MCA/SourceMgr.h"
namespace llvm {
namespace mca {
/// Class which can be overriden by targets to modify the
/// mca::Instruction objects before the pipeline starts.
/// A common usage of this class is to add immediate operands to certain
/// instructions or to remove Defs/Uses from an instruction where the
/// schedulinng model is incorrect.
class InstrPostProcess {
protected:
const MCSubtargetInfo &STI;
const MCInstrInfo &MCII;
public:
InstrPostProcess(const MCSubtargetInfo &STI, const MCInstrInfo &MCII)
: STI(STI), MCII(MCII) {}
virtual ~InstrPostProcess() {}
virtual void postProcessInstruction(std::unique_ptr<Instruction> &Inst,
const MCInst &MCI) {}
};
/// Class which can be overriden by targets to enforce instruction
/// dependencies and behaviours that aren't expressed well enough
/// within the scheduling model for mca to automatically simulate
/// them properly.
/// If you implement this class for your target, make sure to also implement
/// a target specific InstrPostProcess class as well.
class CustomBehaviour {
protected:
const MCSubtargetInfo &STI;
const SourceMgr &SrcMgr;
const MCInstrInfo &MCII;
public:
CustomBehaviour(const MCSubtargetInfo &STI, const SourceMgr &SrcMgr,
const MCInstrInfo &MCII)
: STI(STI), SrcMgr(SrcMgr), MCII(MCII) {}
virtual ~CustomBehaviour() {}
// Before the llvm-mca pipeline dispatches an instruction, it first checks
// for any register or resource dependencies / hazards. If it doesn't find
// any, this method will be invoked to determine if there are any custom
// hazards that the instruction needs to wait for.
// The return value of this method is the number of cycles that the
// instruction needs to wait for.
// It's safe to underestimate the number of cycles to wait for since these
// checks will be invoked again before the intruction gets dispatched.
// However, it's not safe (accurate) to overestimate the number of cycles
// to wait for since the instruction will wait for AT LEAST that number of
// cycles before attempting to be dispatched again.
virtual unsigned checkCustomHazard(ArrayRef<InstRef> IssuedInst,
const InstRef &IR);
};
} // namespace mca
} // namespace llvm
#endif /* LLVM_MCA_CUSTOMBEHAVIOUR_H */

1
include/llvm/MCA/HWEventListener.h
View File

@ -115,7 +115,6 @@ public:
SchedulerQueueFull,
LoadQueueFull,
StoreQueueFull,
CustomBehaviourStall,
LastGenericEvent
};

132
include/llvm/MCA/Instruction.h
View File

@ -33,104 +33,6 @@ namespace mca {
constexpr int UNKNOWN_CYCLES = -512;
/// A representation of an mca::Instruction operand
/// for use in mca::CustomBehaviour.
class MCAOperand {
// This class is mostly copied from MCOperand within
// MCInst.h except that we don't keep track of
// expressions or sub-instructions.
enum MCAOperandType : unsigned char {
kInvalid, ///< Uninitialized, Relocatable immediate, or Sub-instruction.
kRegister, ///< Register operand.
kImmediate, ///< Immediate operand.
kSFPImmediate, ///< Single-floating-point immediate operand.
kDFPImmediate, ///< Double-Floating-point immediate operand.
};
MCAOperandType Kind = kInvalid;
union {
unsigned RegVal;
int64_t ImmVal;
uint32_t SFPImmVal;
uint64_t FPImmVal;
};
// We only store specific operands for specific instructions
// so an instruction's operand 3 may be stored within the list
// of MCAOperand as element 0. This Index attribute keeps track
// of the original index (3 for this example).
unsigned Index;
public:
MCAOperand() : FPImmVal(0) {}
bool isValid() const { return Kind != kInvalid; }
bool isReg() const { return Kind == kRegister; }
bool isImm() const { return Kind == kImmediate; }
bool isSFPImm() const { return Kind == kSFPImmediate; }
bool isDFPImm() const { return Kind == kDFPImmediate; }
/// Returns the register number.
unsigned getReg() const {
assert(isReg() && "This is not a register operand!");
return RegVal;
}
int64_t getImm() const {
assert(isImm() && "This is not an immediate");
return ImmVal;
}
uint32_t getSFPImm() const {
assert(isSFPImm() && "This is not an SFP immediate");
return SFPImmVal;
}
uint64_t getDFPImm() const {
assert(isDFPImm() && "This is not an FP immediate");
return FPImmVal;
}
void setIndex(const unsigned Idx) { Index = Idx; }
unsigned getIndex() const { return Index; }
static MCAOperand createReg(unsigned Reg) {
MCAOperand Op;
Op.Kind = kRegister;
Op.RegVal = Reg;
return Op;
}
static MCAOperand createImm(int64_t Val) {
MCAOperand Op;
Op.Kind = kImmediate;
Op.ImmVal = Val;
return Op;
}
static MCAOperand createSFPImm(uint32_t Val) {
MCAOperand Op;
Op.Kind = kSFPImmediate;
Op.SFPImmVal = Val;
return Op;
}
static MCAOperand createDFPImm(uint64_t Val) {
MCAOperand Op;
Op.Kind = kDFPImmediate;
Op.FPImmVal = Val;
return Op;
}
static MCAOperand createInvalid() {
MCAOperand Op;
Op.Kind = kInvalid;
Op.FPImmVal = 0;
return Op;
}
};
/// A register write descriptor.
struct WriteDescriptor {
// Operand index. The index is negative for implicit writes only.
@ -258,7 +160,6 @@ public:
int getCyclesLeft() const { return CyclesLeft; }
unsigned getWriteResourceID() const { return WD->SClassOrWriteResourceID; }
MCPhysReg getRegisterID() const { return RegisterID; }
void setRegisterID(const MCPhysReg RegID) { RegisterID = RegID; }
unsigned getRegisterFileID() const { return PRFID; }
unsigned getLatency() const { return WD->Latency; }
unsigned getDependentWriteCyclesLeft() const {
@ -508,15 +409,8 @@ class InstructionBase {
// One entry per each implicit and explicit register use.
SmallVector<ReadState, 4> Uses;
// List of operands which can be used by mca::CustomBehaviour
std::vector<MCAOperand> Operands;
// Instruction opcode which can be used by mca::CustomBehaviour
unsigned Opcode;
public:
InstructionBase(const InstrDesc &D, const unsigned Opcode)
: Desc(D), IsOptimizableMove(false), Operands(0), Opcode(Opcode) {}
InstructionBase(const InstrDesc &D) : Desc(D), IsOptimizableMove(false) {}
SmallVectorImpl<WriteState> &getDefs() { return Defs; }
ArrayRef<WriteState> getDefs() const { return Defs; }
@ -526,20 +420,6 @@ public:
unsigned getLatency() const { return Desc.MaxLatency; }
unsigned getNumMicroOps() const { return Desc.NumMicroOps; }
unsigned getOpcode() const { return Opcode; }
/// Return the MCAOperand which corresponds to index Idx within the original
/// MCInst.
const MCAOperand *getOperand(const unsigned Idx) const {
auto It = std::find_if(
Operands.begin(), Operands.end(),
[&Idx](const MCAOperand &Op) { return Op.getIndex() == Idx; });
if (It == Operands.end())
return nullptr;
return &(*It);
}
unsigned getNumOperands() const { return Operands.size(); }
void addOperand(const MCAOperand Op) { Operands.push_back(Op); }
bool hasDependentUsers() const {
return any_of(Defs,
@ -610,11 +490,11 @@ class Instruction : public InstructionBase {
bool IsEliminated;
public:
Instruction(const InstrDesc &D, const unsigned Opcode)
: InstructionBase(D, Opcode), Stage(IS_INVALID),
CyclesLeft(UNKNOWN_CYCLES), RCUTokenID(0), LSUTokenID(0),
UsedBuffers(D.UsedBuffers), CriticalRegDep(), CriticalMemDep(),
CriticalResourceMask(0), IsEliminated(false) {}
Instruction(const InstrDesc &D)
: InstructionBase(D), Stage(IS_INVALID), CyclesLeft(UNKNOWN_CYCLES),
RCUTokenID(0), LSUTokenID(0), UsedBuffers(D.UsedBuffers),
CriticalRegDep(), CriticalMemDep(), CriticalResourceMask(0),
IsEliminated(false) {}
unsigned getRCUTokenID() const { return RCUTokenID; }
unsigned getLSUTokenID() const { return LSUTokenID; }

13
include/llvm/MCA/Stages/InOrderIssueStage.h
View File

@ -14,7 +14,6 @@
#ifndef LLVM_MCA_STAGES_INORDERISSUESTAGE_H
#define LLVM_MCA_STAGES_INORDERISSUESTAGE_H
#include "llvm/MCA/CustomBehaviour.h"
#include "llvm/MCA/HardwareUnits/ResourceManager.h"
#include "llvm/MCA/SourceMgr.h"
#include "llvm/MCA/Stages/Stage.h"
@ -24,13 +23,7 @@ namespace mca {
class RegisterFile;
struct StallInfo {
enum class StallKind {
DEFAULT,
REGISTER_DEPS,
DISPATCH,
DELAY,
CUSTOM_STALL
};
enum class StallKind { DEFAULT, REGISTER_DEPS, DISPATCH, DELAY };
InstRef IR;
unsigned CyclesLeft;
@ -53,7 +46,6 @@ class InOrderIssueStage final : public Stage {
const MCSubtargetInfo &STI;
RegisterFile &PRF;
ResourceManager RM;
CustomBehaviour &CB;
/// Instructions that were issued, but not executed yet.
SmallVector<InstRef, 4> IssuedInst;
@ -109,8 +101,7 @@ class InOrderIssueStage final : public Stage {
void retireInstruction(InstRef &IR);
public:
InOrderIssueStage(const MCSubtargetInfo &STI, RegisterFile &PRF,
CustomBehaviour &CB);
InOrderIssueStage(const MCSubtargetInfo &STI, RegisterFile &PRF);
unsigned getIssueWidth() const;
bool isAvailable(const InstRef &) const override;

1
lib/MCA/CMakeLists.txt
View File

@ -1,7 +1,6 @@
add_llvm_component_library(LLVMMCA
CodeEmitter.cpp
Context.cpp
CustomBehaviour.cpp
HWEventListener.cpp
HardwareUnits/HardwareUnit.cpp
HardwareUnits/LSUnit.cpp

10
lib/MCA/Context.cpp
View File

@ -29,12 +29,11 @@ namespace llvm {
namespace mca {
std::unique_ptr<Pipeline>
Context::createDefaultPipeline(const PipelineOptions &Opts, SourceMgr &SrcMgr,
CustomBehaviour &CB) {
Context::createDefaultPipeline(const PipelineOptions &Opts, SourceMgr &SrcMgr) {
const MCSchedModel &SM = STI.getSchedModel();
if (!SM.isOutOfOrder())
return createInOrderPipeline(Opts, SrcMgr, CB);
return createInOrderPipeline(Opts, SrcMgr);
// Create the hardware units defining the backend.
auto RCU = std::make_unique<RetireControlUnit>(SM);
@ -70,14 +69,13 @@ Context::createDefaultPipeline(const PipelineOptions &Opts, SourceMgr &SrcMgr,
}
std::unique_ptr<Pipeline>
Context::createInOrderPipeline(const PipelineOptions &Opts, SourceMgr &SrcMgr,
CustomBehaviour &CB) {
Context::createInOrderPipeline(const PipelineOptions &Opts, SourceMgr &SrcMgr) {
const MCSchedModel &SM = STI.getSchedModel();
auto PRF = std::make_unique<RegisterFile>(SM, MRI, Opts.RegisterFileSize);
// Create the pipeline stages.
auto Entry = std::make_unique<EntryStage>(SrcMgr);
auto InOrderIssue = std::make_unique<InOrderIssueStage>(STI, *PRF, CB);
auto InOrderIssue = std::make_unique<InOrderIssueStage>(STI, *PRF);
auto StagePipeline = std::make_unique<Pipeline>();
// Pass the ownership of all the hardware units to this Context.

26
lib/MCA/CustomBehaviour.cpp
View File

@ -1,26 +0,0 @@
//===--------------------- CustomBehaviour.cpp ------------------*- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
/// \file
///
/// This file implements methods from the CustomBehaviour interface.
///
//===----------------------------------------------------------------------===//
#include "llvm/MCA/CustomBehaviour.h"
namespace llvm {
namespace mca {
unsigned CustomBehaviour::checkCustomHazard(ArrayRef<InstRef> IssuedInst,
const InstRef &IR) {
// 0 signifies that there are no hazards that need to be waited on
return 0;
}
} // namespace mca
} // namespace llvm

3
lib/MCA/InstrBuilder.cpp
View File

@ -603,8 +603,7 @@ InstrBuilder::createInstruction(const MCInst &MCI) {
if (!DescOrErr)
return DescOrErr.takeError();
const InstrDesc &D = *DescOrErr;
std::unique_ptr<Instruction> NewIS =
std::make_unique<Instruction>(D, MCI.getOpcode());
std::unique_ptr<Instruction> NewIS = std::make_unique<Instruction>(D);
// Check if this is a dependency breaking instruction.
APInt Mask;

14
lib/MCA/Stages/InOrderIssueStage.cpp
View File

@ -43,8 +43,8 @@ void StallInfo::cycleEnd() {
}
InOrderIssueStage::InOrderIssueStage(const MCSubtargetInfo &STI,
RegisterFile &PRF, CustomBehaviour &CB)
: STI(STI), PRF(PRF), RM(STI.getSchedModel()), CB(CB), NumIssued(), SI(),
RegisterFile &PRF)
: STI(STI), PRF(PRF), RM(STI.getSchedModel()), NumIssued(), SI(),
CarryOver(), Bandwidth(), LastWriteBackCycle() {}
unsigned InOrderIssueStage::getIssueWidth() const {
@ -125,11 +125,6 @@ bool InOrderIssueStage::canExecute(const InstRef &IR) {
return false;
}
if (unsigned CustomStallCycles = CB.checkCustomHazard(IssuedInst, IR)) {
SI.update(IR, CustomStallCycles, StallInfo::StallKind::CUSTOM_STALL);
return false;
}
if (LastWriteBackCycle) {
if (!IR.getInstruction()->getDesc().RetireOOO) {
unsigned NextWriteBackCycle = findFirstWriteBackCycle(IR);
@ -338,11 +333,6 @@ void InOrderIssueStage::notifyStallEvent() {
HWPressureEvent(HWPressureEvent::RESOURCES, IR));
break;
}
case StallInfo::StallKind::CUSTOM_STALL: {
notifyEvent<HWStallEvent>(
HWStallEvent(HWStallEvent::CustomBehaviourStall, IR));
break;
}
}
}

6
tools/llvm-mca/CMakeLists.txt
View File

@ -1,7 +1,5 @@
include_directories(include)
add_subdirectory(lib)
set(LLVM_LINK_COMPONENTS
AllTargetsAsmParsers
AllTargetsDescs
@ -32,7 +30,3 @@ add_llvm_tool(llvm-mca
)
set(LLVM_MCA_SOURCE_DIR ${CURRENT_SOURCE_DIR})
target_link_libraries(llvm-mca PRIVATE
${LLVM_MCA_CUSTOMBEHAVIOUR_TARGETS}
)

2
tools/llvm-mca/Views/DispatchStatistics.cpp
View File

@ -77,8 +77,6 @@ void DispatchStatistics::printDispatchStalls(raw_ostream &OS) const {
printStalls(SS, HWStalls[HWStallEvent::StoreQueueFull], NumCycles);
SS << "\nGROUP - Static restrictions on the dispatch group: ";
printStalls(SS, HWStalls[HWStallEvent::DispatchGroupStall], NumCycles);
SS << "\nUSH - Uncategorised Structural Hazard: ";
printStalls(SS, HWStalls[HWStallEvent::CustomBehaviourStall], NumCycles);
SS << '\n';
SS.flush();
OS << Buffer;

33
tools/llvm-mca/lib/AMDGPU/AMDGPUCustomBehaviour.cpp
View File

@ -1,33 +0,0 @@
//===------------------ AMDGPUCustomBehaviour.cpp ---------------*-C++ -* -===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
/// \file
///
/// This file implements methods from the AMDGPUCustomBehaviour class.
///
//===----------------------------------------------------------------------===//
#include "AMDGPUCustomBehaviour.h"
#include "MCTargetDesc/AMDGPUMCTargetDesc.h"
#include "SIInstrInfo.h"
#include "llvm/Support/WithColor.h"
namespace llvm {
namespace mca {
AMDGPUCustomBehaviour::AMDGPUCustomBehaviour(const MCSubtargetInfo &STI,
const SourceMgr &SrcMgr,
const MCInstrInfo &MCII)
: CustomBehaviour(STI, SrcMgr, MCII) {}
unsigned AMDGPUCustomBehaviour::checkCustomHazard(ArrayRef<InstRef> IssuedInst,
const InstRef &IR) {
return 0;
}
} // namespace mca
} // namespace llvm

57
tools/llvm-mca/lib/AMDGPU/AMDGPUCustomBehaviour.h
View File

@ -1,57 +0,0 @@
//===------------------- AMDGPUCustomBehaviour.h ----------------*-C++ -* -===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
/// \file
///
/// This file defines the AMDGPUCustomBehaviour class which inherits from
/// CustomBehaviour.
///
//===----------------------------------------------------------------------===//
#ifndef LLVM_TOOLS_LLVM_MCA_LIB_AMDGPU_AMDGPUCUSTOMBEHAVIOUR_H
#define LLVM_TOOLS_LLVM_MCA_LIB_AMDGPU_AMDGPUCUSTOMBEHAVIOUR_H
#include "llvm/ADT/SmallVector.h"
#include "llvm/MCA/CustomBehaviour.h"
#include "llvm/Support/TargetParser.h"
namespace llvm {
namespace mca {
class AMDGPUInstrPostProcess : public InstrPostProcess {
public:
AMDGPUInstrPostProcess(const MCSubtargetInfo &STI, const MCInstrInfo &MCII)
: InstrPostProcess(STI, MCII) {}
~AMDGPUInstrPostProcess() {}
void postProcessInstruction(std::unique_ptr<Instruction> &Inst,
const MCInst &MCI) override {}
};
class AMDGPUCustomBehaviour : public CustomBehaviour {
public:
AMDGPUCustomBehaviour(const MCSubtargetInfo &STI, const SourceMgr &SrcMgr,
const MCInstrInfo &MCII);
~AMDGPUCustomBehaviour() {}
/// This method is used to determine if an instruction
/// should be allowed to be dispatched. The return value is
/// how many cycles until the instruction can be dispatched.
/// This method is called after MCA has already checked for
/// register and hardware dependencies so this method should only
/// implement custom behaviour and dependencies that are not picked up
/// by MCA naturally.
unsigned checkCustomHazard(ArrayRef<InstRef> IssuedInst,
const InstRef &IR) override;
};
} // namespace mca
} // namespace llvm
#endif /* LLVM_TOOLS_LLVM_MCA_LIB_AMDGPU_AMDGPUCUSTOMBEHAVIOUR_H */

17
tools/llvm-mca/lib/AMDGPU/CMakeLists.txt
View File

@ -1,17 +0,0 @@
include_directories(
${LLVM_MAIN_SRC_DIR}/lib/Target/AMDGPU
${LLVM_BINARY_DIR}/lib/Target/AMDGPU
)
set(LLVM_LINK_COMPONENTS
AMDGPU
Core
Support
)
add_llvm_library(LLVMMCACustomBehaviourAMDGPU
AMDGPUCustomBehaviour.cpp
DEPENDS
AMDGPUCommonTableGen
)

8
tools/llvm-mca/lib/CMakeLists.txt
View File

@ -1,8 +0,0 @@
set(TARGETS_TO_APPEND "")
if (LLVM_TARGETS_TO_BUILD MATCHES "AMDGPU")
add_subdirectory(AMDGPU)
list(APPEND TARGETS_TO_APPEND LLVMMCACustomBehaviourAMDGPU)
endif()
set(LLVM_MCA_CUSTOMBEHAVIOUR_TARGETS ${TARGETS_TO_APPEND} PARENT_SCOPE)

56
tools/llvm-mca/llvm-mca.cpp
View File

@ -32,7 +32,6 @@
#include "Views/SchedulerStatistics.h"
#include "Views/SummaryView.h"
#include "Views/TimelineView.h"
#include "lib/AMDGPU/AMDGPUCustomBehaviour.h"
#include "llvm/MC/MCAsmBackend.h"
#include "llvm/MC/MCAsmInfo.h"
#include "llvm/MC/MCCodeEmitter.h"
@ -43,7 +42,6 @@
#include "llvm/MC/MCTargetOptionsCommandFlags.h"
#include "llvm/MCA/CodeEmitter.h"
#include "llvm/MCA/Context.h"
#include "llvm/MCA/CustomBehaviour.h"
#include "llvm/MCA/InstrBuilder.h"
#include "llvm/MCA/Pipeline.h"
#include "llvm/MCA/Stages/EntryStage.h"
@ -222,12 +220,6 @@ static cl::opt<bool> ShowEncoding(
cl::desc("Print encoding information in the instruction info view"),
cl::cat(ViewOptions), cl::init(false));
static cl::opt<bool> DisableCustomBehaviour(
"disable-cb",
cl::desc(
"Disable custom behaviour (use the default class which does nothing)."),
cl::cat(ViewOptions), cl::init(false));
namespace {
const Target *getTarget(const char *ProgName) {
@ -293,39 +285,6 @@ static void processViewOptions(bool IsOutOfOrder) {
processOptionImpl(PrintRetireStats, Default);
}
std::unique_ptr<mca::InstrPostProcess>
createInstrPostProcess(const Triple &TheTriple, const MCSubtargetInfo &STI,
const MCInstrInfo &MCII) {
// Might be a good idea to have a separate flag so that InstrPostProcess
// can be used with or without CustomBehaviour
if (DisableCustomBehaviour)
return std::make_unique<mca::InstrPostProcess>(STI, MCII);
if (TheTriple.isAMDGPU())
return std::make_unique<mca::AMDGPUInstrPostProcess>(STI, MCII);
return std::make_unique<mca::InstrPostProcess>(STI, MCII);
}
std::unique_ptr<mca::CustomBehaviour>
createCustomBehaviour(const Triple &TheTriple, const MCSubtargetInfo &STI,
const mca::SourceMgr &SrcMgr, const MCInstrInfo &MCII) {
// Build the appropriate CustomBehaviour object for the current target.
// The CustomBehaviour class should never depend on the source code,
// but it can depend on the list of mca::Instruction and any classes
// that can be built using just the target info. If you need extra
// information from the source code or the list of MCInst, consider
// adding that information to the mca::Instruction class and setting
// it during InstrBuilder::createInstruction().
if (DisableCustomBehaviour)
return std::make_unique<mca::CustomBehaviour>(STI, SrcMgr, MCII);
if (TheTriple.isAMDGPU())
return std::make_unique<mca::AMDGPUCustomBehaviour>(STI, SrcMgr, MCII);
return std::make_unique<mca::CustomBehaviour>(STI, SrcMgr, MCII);
}
// Returns true on success.
static bool runPipeline(mca::Pipeline &P) {
// Handle pipeline errors here.
@ -539,8 +498,6 @@ int main(int argc, char **argv) {
// Lower the MCInst sequence into an mca::Instruction sequence.
ArrayRef<MCInst> Insts = Region->getInstructions();
mca::CodeEmitter CE(*STI, *MAB, *MCE, Insts);
std::unique_ptr<mca::InstrPostProcess> IPP =
createInstrPostProcess(TheTriple, *STI, *MCII);
std::vector<std::unique_ptr<mca::Instruction>> LoweredSequence;
for (const MCInst &MCI : Insts) {
Expected<std::unique_ptr<mca::Instruction>> Inst =
@ -563,8 +520,6 @@ int main(int argc, char **argv) {
return 1;
}
IPP->postProcessInstruction(Inst.get(), MCI);
LoweredSequence.emplace_back(std::move(Inst.get()));
}
@ -592,17 +547,8 @@ int main(int argc, char **argv) {
continue;
}
// Create the CustomBehaviour object for enforcing Target Specific
// behaviours and dependencies that aren't expressed well enough
// in the tablegen. CB cannot depend on the list of MCInst or
// the source code (but it can depend on the list of
// mca::Instruction or any objects that can be reconstructed
// from the target information).
std::unique_ptr<mca::CustomBehaviour> CB =
createCustomBehaviour(TheTriple, *STI, S, *MCII);
// Create a basic pipeline simulating an out-of-order backend.
auto P = MCA.createDefaultPipeline(PO, S, *CB);
auto P = MCA.createDefaultPipeline(PO, S);
mca::PipelinePrinter Printer(*P, PrintJson ? mca::View::OK_JSON
: mca::View::OK_READABLE);