1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00

Re-land "[llvm-exegesis] Save target state before running the benchmark."

The X86 exegesis target is never executed run on non-X86 hosts, disable
X86 instrinsic code on non-X86 targets.

This reverts commit 8cfc872129a99782ab07a19171bf8eace85589ae.
This commit is contained in:
Clement Courbet 2020-11-04 08:56:27 +01:00
parent 878101132b
commit 3104bbde01
5 changed files with 63 additions and 2 deletions

View File

@ -0,0 +1,6 @@
# RUN: llvm-exegesis -mode=uops -opcode-name=FLDENVm,FLDL2E -repetition-mode=duplicate | FileCheck %s
CHECK: mode: uops
CHECK-NEXT: key:
CHECK-NEXT: instructions:
CHECK-NEXT: FLDENVm

View File

@ -71,10 +71,10 @@ private:
SmallVector<StringRef, 2> CounterNames;
StringRef(Counters).split(CounterNames, '+');
char *const ScratchPtr = Scratch->ptr();
const ExegesisTarget &ET = State.getExegesisTarget();
for (auto &CounterName : CounterNames) {
CounterName = CounterName.trim();
auto CounterOrError =
State.getExegesisTarget().createCounter(CounterName, State);
auto CounterOrError = ET.createCounter(CounterName, State);
if (!CounterOrError)
return CounterOrError.takeError();
@ -93,6 +93,7 @@ private:
.concat(std::to_string(Reserved)));
Scratch->clear();
{
auto PS = ET.withSavedState();
CrashRecoveryContext CRC;
CrashRecoveryContext::Enable();
const bool Crashed = !CRC.RunSafely([this, Counter, ScratchPtr]() {
@ -101,6 +102,7 @@ private:
Counter->stop();
});
CrashRecoveryContext::Disable();
PS.reset();
if (Crashed) {
std::string Msg = "snippet crashed while running";
#ifdef LLVM_ON_UNIX

View File

@ -147,6 +147,8 @@ const PfmCountersInfo &ExegesisTarget::getPfmCounters(StringRef CpuName) const {
return *Found->PCI;
}
ExegesisTarget::SavedState::~SavedState() {} // anchor.
namespace {
// Default implementation.

View File

@ -172,6 +172,16 @@ public:
// counters are defined for this CPU).
const PfmCountersInfo &getPfmCounters(StringRef CpuName) const;
// Saves the CPU state that needs to be preserved when running a benchmark,
// and returns and RAII object that restores the state on destruction.
// By default no state is preserved.
struct SavedState {
virtual ~SavedState();
};
virtual std::unique_ptr<SavedState> withSavedState() const {
return std::make_unique<SavedState>();
}
private:
virtual bool matchesArch(Triple::ArchType Arch) const = 0;

View File

@ -26,6 +26,9 @@
#include <memory>
#include <string>
#include <vector>
#if defined(_MSC_VER)
#include <immintrin.h>
#endif
namespace llvm {
namespace exegesis {
@ -594,6 +597,40 @@ void ConstantInliner::initStack(unsigned Bytes) {
namespace {
class X86SavedState : public ExegesisTarget::SavedState {
public:
X86SavedState() {
#ifdef __x86_64__
# if defined(_MSC_VER)
_fxsave64(FPState);
# elif defined(__GNUC__)
__builtin_ia32_fxsave64(FPState);
# endif
#else
llvm_unreachable("X86 exegesis running on non-X86 target");
#endif
}
~X86SavedState() {
// Restoring the X87 state does not flush pending exceptions, make sure
// these exceptions are flushed now.
#ifdef __x86_64__
# if defined(_MSC_VER)
_clearfp();
_fxrstor64(FPState);
# elif defined(__GNUC__)
asm volatile("fwait");
__builtin_ia32_fxrstor64(FPState);
# endif
#else
llvm_unreachable("X86 exegesis running on non-X86 target");
#endif
}
private:
alignas(16) char FPState[512];
};
class ExegesisX86Target : public ExegesisTarget {
public:
ExegesisX86Target() : ExegesisTarget(X86CpuPfmCounters) {}
@ -691,6 +728,10 @@ private:
#endif
}
std::unique_ptr<SavedState> withSavedState() const override {
return std::make_unique<X86SavedState>();
}
static const unsigned kUnavailableRegisters[4];
};