[llvm] r346398 - Revert "[llvm-exegesis] Add a snippet generator to generate snippets to compute ROB sizes."
Clement Courbet via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 8 04:09:45 PST 2018
Author: courbet
Date: Thu Nov 8 04:09:45 2018
New Revision: 346398
URL: http://llvm.org/viewvc/llvm-project?rev=346398&view=rev
Log:
Revert "[llvm-exegesis] Add a snippet generator to generate snippets to compute ROB sizes."
This reverts accidental commit rL346394.
Removed:
llvm/trunk/tools/llvm-exegesis/lib/ROBSize.cpp
llvm/trunk/tools/llvm-exegesis/lib/ROBSize.h
Modified:
llvm/trunk/tools/llvm-exegesis/lib/Assembler.cpp
llvm/trunk/tools/llvm-exegesis/lib/Assembler.h
llvm/trunk/tools/llvm-exegesis/lib/BenchmarkCode.h
llvm/trunk/tools/llvm-exegesis/lib/BenchmarkResult.h
llvm/trunk/tools/llvm-exegesis/lib/BenchmarkRunner.cpp
llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt
llvm/trunk/tools/llvm-exegesis/lib/CodeTemplate.h
llvm/trunk/tools/llvm-exegesis/lib/RegisterValue.h
llvm/trunk/tools/llvm-exegesis/lib/SnippetGenerator.cpp
llvm/trunk/tools/llvm-exegesis/lib/SnippetGenerator.h
llvm/trunk/tools/llvm-exegesis/lib/Target.cpp
llvm/trunk/tools/llvm-exegesis/lib/Target.h
llvm/trunk/tools/llvm-exegesis/lib/X86/Target.cpp
llvm/trunk/tools/llvm-exegesis/llvm-exegesis.cpp
Modified: llvm/trunk/tools/llvm-exegesis/lib/Assembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/Assembler.cpp?rev=346398&r1=346397&r2=346398&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/Assembler.cpp (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/Assembler.cpp Thu Nov 8 04:09:45 2018
@@ -32,19 +32,10 @@ static constexpr const char FunctionID[]
static std::vector<llvm::MCInst>
generateSnippetSetupCode(const ExegesisTarget &ET,
const llvm::MCSubtargetInfo *const MSI,
- const unsigned ScratchReg,
- llvm::ArrayRef<unsigned> ScratchRegisterCopies,
llvm::ArrayRef<RegisterValue> RegisterInitialValues,
bool &IsSnippetSetupComplete) {
IsSnippetSetupComplete = true;
std::vector<llvm::MCInst> Result;
- // Copy registers.
- for (const unsigned Reg : ScratchRegisterCopies) {
- assert(ScratchReg > 0 && "scratch reg copies but no scratch reg");
- const auto CopyRegisterCode = ET.copyReg(*MSI, Reg, ScratchReg);
- Result.insert(Result.end(), CopyRegisterCode.begin(), CopyRegisterCode.end());
- }
- // Load values in registers.
for (const RegisterValue &RV : RegisterInitialValues) {
// Load a constant in the register.
const auto SetRegisterCode = ET.setRegTo(*MSI, RV.Register, RV.Value);
@@ -164,7 +155,6 @@ llvm::BitVector getFunctionReservedRegs(
void assembleToStream(const ExegesisTarget &ET,
std::unique_ptr<llvm::LLVMTargetMachine> TM,
llvm::ArrayRef<unsigned> LiveIns,
- llvm::ArrayRef<unsigned> ScratchRegisterCopies,
llvm::ArrayRef<RegisterValue> RegisterInitialValues,
llvm::ArrayRef<llvm::MCInst> Instructions,
llvm::raw_pwrite_stream &AsmStream) {
@@ -188,7 +178,7 @@ void assembleToStream(const ExegesisTarg
bool IsSnippetSetupComplete;
std::vector<llvm::MCInst> Code =
- generateSnippetSetupCode(ET, TM->getMCSubtargetInfo(), ET.getScratchMemoryRegister(TM->getTargetTriple()), ScratchRegisterCopies,
+ generateSnippetSetupCode(ET, TM->getMCSubtargetInfo(),
RegisterInitialValues, IsSnippetSetupComplete);
Code.insert(Code.end(), Instructions.begin(), Instructions.end());
@@ -209,7 +199,7 @@ void assembleToStream(const ExegesisTarg
llvm::MCContext &MCContext = MMI->getContext();
llvm::legacy::PassManager PM;
- llvm::TargetLibraryInfoImpl TLII(Triple(Module->getTargetTriple()));
+ llvm::TargetLibraryInfoImpl TLII(llvm::Triple(Module->getTargetTriple()));
PM.add(new llvm::TargetLibraryInfoWrapperPass(TLII));
llvm::TargetPassConfig *TPC = TM->createPassConfig(PM);
Modified: llvm/trunk/tools/llvm-exegesis/lib/Assembler.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/Assembler.h?rev=346398&r1=346397&r2=346398&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/Assembler.h (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/Assembler.h Thu Nov 8 04:09:45 2018
@@ -48,7 +48,6 @@ llvm::BitVector getFunctionReservedRegs(
void assembleToStream(const ExegesisTarget &ET,
std::unique_ptr<llvm::LLVMTargetMachine> TM,
llvm::ArrayRef<unsigned> LiveIns,
- llvm::ArrayRef<unsigned> ScratchRegisterCopies,
llvm::ArrayRef<RegisterValue> RegisterInitialValues,
llvm::ArrayRef<llvm::MCInst> Instructions,
llvm::raw_pwrite_stream &AsmStream);
Modified: llvm/trunk/tools/llvm-exegesis/lib/BenchmarkCode.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/BenchmarkCode.h?rev=346398&r1=346397&r2=346398&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/BenchmarkCode.h (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/BenchmarkCode.h Thu Nov 8 04:09:45 2018
@@ -27,10 +27,6 @@ struct BenchmarkCode {
// registers initial values.
std::vector<RegisterValue> RegisterInitialValues;
- // Before the code is executed some instructions are added to copy the
- // scratch register into the specified registers.
- std::vector<unsigned> ScratchRegisterCopies;
-
// We also need to provide the registers that are live on entry for the
// assembler to generate proper prologue/epilogue.
std::vector<unsigned> LiveIns;
Modified: llvm/trunk/tools/llvm-exegesis/lib/BenchmarkResult.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/BenchmarkResult.h?rev=346398&r1=346397&r2=346398&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/BenchmarkResult.h (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/BenchmarkResult.h Thu Nov 8 04:09:45 2018
@@ -58,7 +58,7 @@ struct BenchmarkMeasure {
// The result of an instruction benchmark.
struct InstructionBenchmark {
InstructionBenchmarkKey Key;
- enum ModeE { Unknown, Latency, Uops, ROBSize };
+ enum ModeE { Unknown, Latency, Uops };
ModeE Mode;
std::string CpuName;
std::string LLVMTriple;
Modified: llvm/trunk/tools/llvm-exegesis/lib/BenchmarkRunner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/BenchmarkRunner.cpp?rev=346398&r1=346397&r2=346398&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/BenchmarkRunner.cpp (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/BenchmarkRunner.cpp Thu Nov 8 04:09:45 2018
@@ -168,7 +168,7 @@ BenchmarkRunner::writeObjectFile(const B
return std::move(E);
llvm::raw_fd_ostream OFS(ResultFD, true /*ShouldClose*/);
assembleToStream(State.getExegesisTarget(), State.createTargetMachine(),
- BC.LiveIns, BC.ScratchRegisterCopies, BC.RegisterInitialValues, Code, OFS);
+ BC.LiveIns, BC.RegisterInitialValues, Code, OFS);
return ResultPath.str();
}
Modified: llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt?rev=346398&r1=346397&r2=346398&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt Thu Nov 8 04:09:45 2018
@@ -23,7 +23,6 @@ add_library(LLVMExegesis
LlvmState.cpp
MCInstrDescView.cpp
PerfHelper.cpp
- ROBSize.cpp
RegisterAliasing.cpp
SnippetGenerator.cpp
RegisterValue.cpp
Modified: llvm/trunk/tools/llvm-exegesis/lib/CodeTemplate.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/CodeTemplate.h?rev=346398&r1=346397&r2=346398&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/CodeTemplate.h (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/CodeTemplate.h Thu Nov 8 04:09:45 2018
@@ -17,7 +17,6 @@
#define LLVM_TOOLS_LLVM_EXEGESIS_CODETEMPLATE_H
#include "MCInstrDescView.h"
-#include "RegisterValue.h"
#include "llvm/ADT/BitmaskEnum.h"
namespace llvm {
@@ -121,9 +120,6 @@ struct CodeTemplate {
std::string Info;
// The list of the instructions for this template.
std::vector<InstructionTemplate> Instructions;
- // The list of registers in which to copy the scratch register as a setup
- // step.
- std::vector<unsigned> ScratchRegisterCopies;
// If the template uses the provided scratch memory, the register in which
// the pointer to this memory is passed in to the function.
unsigned ScratchSpacePointerInReg = 0;
Removed: llvm/trunk/tools/llvm-exegesis/lib/ROBSize.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/ROBSize.cpp?rev=346397&view=auto
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/ROBSize.cpp (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/ROBSize.cpp (removed)
@@ -1,69 +0,0 @@
-//===-- Uops.cpp ------------------------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ROBSize.h"
-
-#include "Assembler.h"
-#include "BenchmarkRunner.h"
-#include "MCInstrDescView.h"
-#include "Target.h"
-
-namespace llvm {
-namespace exegesis {
-
-ROBSizeSnippetGenerator::~ROBSizeSnippetGenerator() = default;
-
-llvm::Expected<std::vector<CodeTemplate>>
-ROBSizeSnippetGenerator::generateCodeTemplates(const Instruction &Instr) const {
- CodeTemplate CT;
- // const llvm::BitVector *ScratchSpaceAliasedRegs = nullptr;
- const auto &ET = State.getExegesisTarget();
- const auto &TM = State.getTargetMachine();
-
- CT.ScratchSpacePointerInReg =
- ET.getScratchMemoryRegister(TM.getTargetTriple());
- if (CT.ScratchSpacePointerInReg == 0)
- return llvm::make_error<BenchmarkFailure>(
- "Infeasible : target does not support memory instructions");
- // ScratchSpaceAliasedRegs =
- // &State.getRATC().getRegister(CT.ScratchSpacePointerInReg).aliasedBits();
-
- const unsigned ECX = 50u; // FIXME: pick any available register.
- const unsigned EDX = 52u; // FIXME: pick any available register.
- CT.ScratchRegisterCopies.push_back(ECX);
- CT.ScratchRegisterCopies.push_back(EDX);
-
- /*
- const llvm::TargetInstrInfo *const TII =
- State.getSubtargetInfo().getInstrInfo(); MCInst NopInst;
- TII->getNoop(NopInst);
- */
- Instruction ChaseRegInst(State.getInstrInfo(), State.getRATC(), ET.getChaseRegOpcode());
- //errs() << ChaseRegInst.Variables.size() << "\n";
- assert(ChaseRegInst.Variables.size() >= 2 && "'mov reg, [reg]'' should have at least two variables");
- InstructionTemplate IT1(ChaseRegInst);
- IT1.getValueFor(ChaseRegInst.Variables[0]) = MCOperand::createReg(ECX);
- ET.fillMemoryOperands(IT1, ECX, 0);
- CT.Instructions.push_back(std::move(IT1));
- InstructionTemplate IT2(ChaseRegInst);
- IT2.getValueFor(ChaseRegInst.Variables[0]) = MCOperand::createReg(EDX);
- ET.fillMemoryOperands(IT2, EDX, 0);
- CT.Instructions.push_back(std::move(IT2));
-
- // const auto &ReservedRegisters = State.getRATC().reservedRegisters();
- // No tied variables, we pick random values for defs.
- llvm::BitVector Defs(State.getRegInfo().getNumRegs());
- CT.Info =
- "instruction has no tied variables picking Uses different from defs";
- // CT.Instructions.push_back(std::move(IT));
- return getSingleton(std::move(CT));
-}
-
-} // namespace exegesis
-} // namespace llvm
Removed: llvm/trunk/tools/llvm-exegesis/lib/ROBSize.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/ROBSize.h?rev=346397&view=auto
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/ROBSize.h (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/ROBSize.h (removed)
@@ -1,36 +0,0 @@
-//===-- Uops.h --------------------------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// A BenchmarkRunner implementation to measure uop decomposition.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_EXEGESIS_ROBSIZE_H
-#define LLVM_TOOLS_LLVM_EXEGESIS_ROBSIZE_H
-
-#include "BenchmarkRunner.h"
-#include "SnippetGenerator.h"
-
-namespace llvm {
-namespace exegesis {
-
-class ROBSizeSnippetGenerator : public SnippetGenerator {
-public:
- ROBSizeSnippetGenerator(const LLVMState &State) : SnippetGenerator(State) {}
- ~ROBSizeSnippetGenerator() override;
-
- llvm::Expected<std::vector<CodeTemplate>>
- generateCodeTemplates(const Instruction &Instr) const override;
-};
-
-} // namespace exegesis
-} // namespace llvm
-
-#endif // LLVM_TOOLS_LLVM_EXEGESIS_ROBSIZE_H
Modified: llvm/trunk/tools/llvm-exegesis/lib/RegisterValue.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/RegisterValue.h?rev=346398&r1=346397&r2=346398&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/RegisterValue.h (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/RegisterValue.h Thu Nov 8 04:09:45 2018
@@ -14,9 +14,6 @@
///
//===----------------------------------------------------------------------===//
-#ifndef LLVM_TOOLS_LLVM_EXEGESIS_REGISTERVALUE_H
-#define LLVM_TOOLS_LLVM_EXEGESIS_REGISTERVALUE_H
-
#include <llvm/ADT/APFloat.h>
#include <llvm/ADT/APInt.h>
@@ -25,7 +22,6 @@ namespace exegesis {
// A simple object storing the value for a particular register.
struct RegisterValue {
- static RegisterValue zero(unsigned Reg) { return {Reg, llvm::APInt()}; }
unsigned Register;
llvm::APInt Value;
};
@@ -49,5 +45,3 @@ llvm::APInt bitcastFloatValue(const llvm
} // namespace exegesis
} // namespace llvm
-
-#endif // LLVM_TOOLS_LLVM_EXEGESIS_REGISTERVALUE_H
Modified: llvm/trunk/tools/llvm-exegesis/lib/SnippetGenerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/SnippetGenerator.cpp?rev=346398&r1=346397&r2=346398&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/SnippetGenerator.cpp (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/SnippetGenerator.cpp Thu Nov 8 04:09:45 2018
@@ -56,9 +56,8 @@ SnippetGenerator::generateConfigurations
}
if (CT.ScratchSpacePointerInReg)
BC.LiveIns.push_back(CT.ScratchSpacePointerInReg);
- BC.ScratchRegisterCopies = CT.ScratchRegisterCopies;
BC.RegisterInitialValues =
- computeRegisterInitialValues(BC.ScratchRegisterCopies, CT.Instructions);
+ computeRegisterInitialValues(CT.Instructions);
Output.push_back(std::move(BC));
}
}
@@ -68,15 +67,12 @@ SnippetGenerator::generateConfigurations
}
std::vector<RegisterValue> SnippetGenerator::computeRegisterInitialValues(
- const std::vector<unsigned> &ScratchRegisterCopies,
const std::vector<InstructionTemplate> &Instructions) const {
// Collect all register uses and create an assignment for each of them.
// Ignore memory operands which are handled separately.
// Loop invariant: DefinedRegs[i] is true iif it has been set at least once
// before the current instruction.
llvm::BitVector DefinedRegs = State.getRATC().emptyRegisters();
- for (const auto& Reg : ScratchRegisterCopies)
- DefinedRegs.set(Reg);
std::vector<RegisterValue> RIV;
for (const InstructionTemplate &IT : Instructions) {
// Returns the register that this Operand sets or uses, or 0 if this is not
@@ -95,7 +91,7 @@ std::vector<RegisterValue> SnippetGenera
if (Op.isUse()) {
const unsigned Reg = GetOpReg(Op);
if (Reg > 0 && !DefinedRegs.test(Reg)) {
- RIV.push_back(RegisterValue::zero(Reg));
+ RIV.push_back(RegisterValue{Reg, llvm::APInt()});
DefinedRegs.set(Reg);
}
}
Modified: llvm/trunk/tools/llvm-exegesis/lib/SnippetGenerator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/SnippetGenerator.h?rev=346398&r1=346397&r2=346398&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/SnippetGenerator.h (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/SnippetGenerator.h Thu Nov 8 04:09:45 2018
@@ -62,7 +62,6 @@ public:
// Given a snippet, computes which registers the setup code needs to define.
std::vector<RegisterValue> computeRegisterInitialValues(
- const std::vector<unsigned> &ScratchRegisterCopies,
const std::vector<InstructionTemplate> &Snippet) const;
protected:
Modified: llvm/trunk/tools/llvm-exegesis/lib/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/Target.cpp?rev=346398&r1=346397&r2=346398&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/Target.cpp (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/Target.cpp Thu Nov 8 04:09:45 2018
@@ -9,7 +9,6 @@
#include "Target.h"
#include "Latency.h"
-#include "ROBSize.h"
#include "Uops.h"
namespace llvm {
@@ -39,31 +38,6 @@ void ExegesisTarget::registerTarget(Exeg
}
std::unique_ptr<SnippetGenerator>
-ExegesisTarget::createLatencySnippetGenerator(const LLVMState &State) const {
- return llvm::make_unique<LatencySnippetGenerator>(State);
-}
-
-std::unique_ptr<SnippetGenerator>
-ExegesisTarget::createUopsSnippetGenerator(const LLVMState &State) const {
- return llvm::make_unique<UopsSnippetGenerator>(State);
-}
-
-std::unique_ptr<SnippetGenerator>
-static createROBSizeSnippetGenerator(const LLVMState &State) {
- return llvm::make_unique<ROBSizeSnippetGenerator>(State);
-}
-
-std::unique_ptr<BenchmarkRunner>
-ExegesisTarget::createLatencyBenchmarkRunner(const LLVMState &State) const {
- return llvm::make_unique<LatencyBenchmarkRunner>(State);
-}
-
-std::unique_ptr<BenchmarkRunner>
-ExegesisTarget::createUopsBenchmarkRunner(const LLVMState &State) const {
- return llvm::make_unique<UopsBenchmarkRunner>(State);
-}
-
-std::unique_ptr<SnippetGenerator>
ExegesisTarget::createSnippetGenerator(InstructionBenchmark::ModeE Mode,
const LLVMState &State) const {
switch (Mode) {
@@ -73,8 +47,6 @@ ExegesisTarget::createSnippetGenerator(I
return createLatencySnippetGenerator(State);
case InstructionBenchmark::Uops:
return createUopsSnippetGenerator(State);
- case InstructionBenchmark::ROBSize:
- return createROBSizeSnippetGenerator(State);
}
return nullptr;
}
@@ -86,7 +58,6 @@ ExegesisTarget::createBenchmarkRunner(In
case InstructionBenchmark::Unknown:
return nullptr;
case InstructionBenchmark::Latency:
- case InstructionBenchmark::ROBSize:
return createLatencyBenchmarkRunner(State);
case InstructionBenchmark::Uops:
return createUopsBenchmarkRunner(State);
@@ -94,6 +65,26 @@ ExegesisTarget::createBenchmarkRunner(In
return nullptr;
}
+std::unique_ptr<SnippetGenerator>
+ExegesisTarget::createLatencySnippetGenerator(const LLVMState &State) const {
+ return llvm::make_unique<LatencySnippetGenerator>(State);
+}
+
+std::unique_ptr<SnippetGenerator>
+ExegesisTarget::createUopsSnippetGenerator(const LLVMState &State) const {
+ return llvm::make_unique<UopsSnippetGenerator>(State);
+}
+
+std::unique_ptr<BenchmarkRunner>
+ExegesisTarget::createLatencyBenchmarkRunner(const LLVMState &State) const {
+ return llvm::make_unique<LatencyBenchmarkRunner>(State);
+}
+
+std::unique_ptr<BenchmarkRunner>
+ExegesisTarget::createUopsBenchmarkRunner(const LLVMState &State) const {
+ return llvm::make_unique<UopsBenchmarkRunner>(State);
+}
+
static_assert(std::is_pod<PfmCountersInfo>::value,
"We shouldn't have dynamic initialization here");
const PfmCountersInfo PfmCountersInfo::Default = {nullptr, nullptr, nullptr, 0u};
@@ -132,11 +123,6 @@ private:
llvm_unreachable("Not yet implemented");
}
- std::vector<llvm::MCInst> copyReg(const llvm::MCSubtargetInfo &STI,
- unsigned ToReg, unsigned FromReg) const override {
- llvm_unreachable("Not yet implemented");
- }
-
bool matchesArch(llvm::Triple::ArchType Arch) const override {
llvm_unreachable("never called");
return false;
Modified: llvm/trunk/tools/llvm-exegesis/lib/Target.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/Target.h?rev=346398&r1=346397&r2=346398&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/Target.h (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/Target.h Thu Nov 8 04:09:45 2018
@@ -76,11 +76,6 @@ public:
setRegTo(const llvm::MCSubtargetInfo &STI, unsigned Reg,
const llvm::APInt &Value) const = 0;
- // Generates code to copy `FromReg` to `ToReg`.
- // Precondition: Registers must be the same size.
- virtual std::vector<llvm::MCInst>
- copyReg(const llvm::MCSubtargetInfo &STI, unsigned ToReg, unsigned FromReg) const = 0;
-
// Returns the register pointing to scratch memory, or 0 if this target
// does not support memory operands. The benchmark function uses the
// default calling convention.
@@ -88,16 +83,10 @@ public:
return 0;
}
- // Returns the opcode to move the value at `[Reg]` into `Reg`, where `Reg` is
- // the from the same register class as getScratchMemoryRegister().
- virtual unsigned getChaseRegOpcode() const {
- llvm_unreachable(
- "fillMemoryOperands() requires getScratchMemoryRegister() > 0");
- }
-
// Fills memory operands with references to the address at [Reg] + Offset.
virtual void fillMemoryOperands(InstructionTemplate &IT, unsigned Reg,
unsigned Offset) const {
+
llvm_unreachable(
"fillMemoryOperands() requires getScratchMemoryRegister() > 0");
}
Modified: llvm/trunk/tools/llvm-exegesis/lib/X86/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/X86/Target.cpp?rev=346398&r1=346397&r2=346398&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/X86/Target.cpp (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/X86/Target.cpp Thu Nov 8 04:09:45 2018
@@ -484,19 +484,6 @@ private:
return {}; // Not yet implemented.
}
- std::vector<llvm::MCInst> copyReg(const llvm::MCSubtargetInfo &STI,
- unsigned ToReg,
- unsigned FromReg) const override {
- if (llvm::X86::GR64RegClass.contains(ToReg))
- assert(llvm::X86::GR64RegClass.contains(FromReg) && "registers must be the same size");
- return {llvm::MCInstBuilder(X86::MOV64rr).addReg(ToReg).addReg(FromReg)};
- return {}; // Not yet implemented.
- }
-
- unsigned getChaseRegOpcode() const override {
- return X86::MOV64rm;
- }
-
std::unique_ptr<SnippetGenerator>
createLatencySnippetGenerator(const LLVMState &State) const override {
return llvm::make_unique<X86LatencySnippetGenerator>(State);
Modified: llvm/trunk/tools/llvm-exegesis/llvm-exegesis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/llvm-exegesis.cpp?rev=346398&r1=346397&r2=346398&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/llvm-exegesis.cpp (original)
+++ llvm/trunk/tools/llvm-exegesis/llvm-exegesis.cpp Thu Nov 8 04:09:45 2018
@@ -63,8 +63,6 @@ static cl::opt<exegesis::InstructionBenc
"latency", "Instruction Latency"),
clEnumValN(exegesis::InstructionBenchmark::Uops,
"uops", "Uop Decomposition"),
- clEnumValN(exegesis::InstructionBenchmark::ROBSize,
- "rob_size", "ROB Size"),
// When not asking for a specific benchmark mode,
// we'll analyse the results.
clEnumValN(exegesis::InstructionBenchmark::Unknown,
@@ -203,6 +201,7 @@ public:
return;
if (CommentText.consume_front("DEFREG")) {
// LLVM-EXEGESIS-DEFREF <reg> <hex_value>
+ RegisterValue RegVal;
llvm::SmallVector<llvm::StringRef, 2> Parts;
CommentText.split(Parts, ' ', /*unlimited splits*/ -1,
/*do not keep empty strings*/ false);
@@ -211,7 +210,6 @@ public:
<< "\n";
++InvalidComments;
}
- RegisterValue RegVal;
if (!(RegVal.Register = findRegisterByName(Parts[0].trim()))) {
llvm::errs() << "unknown register in 'LLVM-EXEGESIS-DEFREG "
<< CommentText << "\n";
More information about the llvm-commits
mailing list