Skip to content

Commit 9810fe1

Browse files
committed
[MCSchedule] Simplify and remove a C++20-deprecated is_pod call. NFC
1 parent 44dc1e0 commit 9810fe1

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

llvm/include/llvm/CodeGen/TargetSchedule.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class TargetSchedModel {
4646
unsigned computeInstrLatency(const MCSchedClassDesc &SCDesc) const;
4747

4848
public:
49-
TargetSchedModel() : SchedModel(MCSchedModel::GetDefaultSchedModel()) {}
49+
TargetSchedModel() : SchedModel(MCSchedModel::Default) {}
5050

5151
/// Initialize the machine model for instruction scheduling.
5252
///

llvm/include/llvm/MC/MCInstrItineraries.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ struct InstrItinerary {
110110
class InstrItineraryData {
111111
public:
112112
MCSchedModel SchedModel =
113-
MCSchedModel::GetDefaultSchedModel(); ///< Basic machine properties.
114-
const InstrStage *Stages = nullptr; ///< Array of stages selected
113+
MCSchedModel::Default; ///< Basic machine properties.
114+
const InstrStage *Stages = nullptr; ///< Array of stages selected
115115
const unsigned *OperandCycles = nullptr; ///< Array of operand cycles selected
116116
const unsigned *Forwardings = nullptr; ///< Array of pipeline forwarding paths
117117
const InstrItinerary *Itineraries =

llvm/include/llvm/MC/MCSchedule.h

-1
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,6 @@ struct MCSchedModel {
390390
unsigned WriteResourceIdx = 0);
391391

392392
/// Returns the default initialized model.
393-
static const MCSchedModel &GetDefaultSchedModel() { return Default; }
394393
static const MCSchedModel Default;
395394
};
396395

llvm/lib/MC/MCSchedule.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
using namespace llvm;
2222

23-
static_assert(std::is_pod<MCSchedModel>::value,
24-
"We shouldn't have a static constructor here");
23+
static_assert(std::is_trivial_v<MCSchedModel>,
24+
"MCSchedModel is required to be a trivial type");
2525
const MCSchedModel MCSchedModel::Default = {DefaultIssueWidth,
2626
DefaultMicroOpBufferSize,
2727
DefaultLoopMicroOpBufferSize,
@@ -30,7 +30,7 @@ const MCSchedModel MCSchedModel::Default = {DefaultIssueWidth,
3030
DefaultMispredictPenalty,
3131
false,
3232
true,
33-
false /*EnableIntervals*/,
33+
/*EnableIntervals=*/false,
3434
0,
3535
nullptr,
3636
nullptr,

llvm/lib/MC/MCSubtargetInfo.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ void MCSubtargetInfo::InitMCProcessorInfo(StringRef CPU, StringRef TuneCPU,
214214
if (!TuneCPU.empty())
215215
CPUSchedModel = &getSchedModelForCPU(TuneCPU);
216216
else
217-
CPUSchedModel = &MCSchedModel::GetDefaultSchedModel();
217+
CPUSchedModel = &MCSchedModel::Default;
218218
}
219219

220220
void MCSubtargetInfo::setDefaultFeatures(StringRef CPU, StringRef TuneCPU,
@@ -319,7 +319,7 @@ const MCSchedModel &MCSubtargetInfo::getSchedModelForCPU(StringRef CPU) const {
319319
errs() << "'" << CPU
320320
<< "' is not a recognized processor for this target"
321321
<< " (ignoring processor)\n";
322-
return MCSchedModel::GetDefaultSchedModel();
322+
return MCSchedModel::Default;
323323
}
324324
assert(CPUEntry->SchedModel && "Missing processor SchedModel value");
325325
return *CPUEntry->SchedModel;

0 commit comments

Comments
 (0)