Skip to content

Commit 52b4b35

Browse files
Revert "[llvm-exegesis] Set stack pointer register after starting perf counter (#72489)"
This reverts commit 9eb80ab. This is causing failures on multiple builders. Pulling it out until I have time to fix it.
1 parent 85c9c16 commit 52b4b35

File tree

2 files changed

+0
-41
lines changed

2 files changed

+0
-41
lines changed

llvm/test/tools/llvm-exegesis/X86/latency/subprocess-rsp.s

Lines changed: 0 additions & 18 deletions
This file was deleted.

llvm/tools/llvm-exegesis/lib/Assembler.cpp

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "llvm/CodeGen/MachineModuleInfo.h"
2020
#include "llvm/CodeGen/MachineRegisterInfo.h"
2121
#include "llvm/CodeGen/TargetInstrInfo.h"
22-
#include "llvm/CodeGen/TargetLowering.h"
2322
#include "llvm/CodeGen/TargetPassConfig.h"
2423
#include "llvm/CodeGen/TargetSubtargetInfo.h"
2524
#include "llvm/ExecutionEngine/Orc/LLJIT.h"
@@ -61,17 +60,7 @@ static bool generateSnippetSetupCode(
6160
}
6261
BBF.addInstructions(ET.setStackRegisterToAuxMem());
6362
}
64-
Register StackPointerRegister = BBF.MF.getSubtarget()
65-
.getTargetLowering()
66-
->getStackPointerRegisterToSaveRestore();
6763
for (const RegisterValue &RV : RegisterInitialValues) {
68-
if (GenerateMemoryInstructions) {
69-
// If we're generating memory instructions, don't load in the value for
70-
// the register with the stack pointer as it will be used later to finish
71-
// the setup.
72-
if (RV.Register == StackPointerRegister)
73-
continue;
74-
}
7564
// Load a constant in the register.
7665
const auto SetRegisterCode = ET.setRegTo(*MSI, RV.Register, RV.Value);
7766
if (SetRegisterCode.empty())
@@ -82,18 +71,6 @@ static bool generateSnippetSetupCode(
8271
#ifdef HAVE_LIBPFM
8372
BBF.addInstructions(ET.configurePerfCounter(PERF_EVENT_IOC_RESET, true));
8473
#endif // HAVE_LIBPFM
85-
for (const RegisterValue &RV : RegisterInitialValues) {
86-
// Load in the stack register now as we're done using it elsewhere
87-
// and need to set the value in preparation for executing the
88-
// snippet.
89-
if (RV.Register == StackPointerRegister)
90-
continue;
91-
const auto SetRegisterCode = ET.setRegTo(*MSI, RV.Register, RV.Value);
92-
if (SetRegisterCode.empty())
93-
IsSnippetSetupComplete = false;
94-
BBF.addInstructions(SetRegisterCode);
95-
break;
96-
}
9774
}
9875
return IsSnippetSetupComplete;
9976
}

0 commit comments

Comments
 (0)