[llvm] r327978 - [llvm-mca] Use llvm::make_unique in a few places. NFC
Andrea Di Biagio via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 20 05:58:34 PDT 2018
Author: adibiagio
Date: Tue Mar 20 05:58:34 2018
New Revision: 327978
URL: http://llvm.org/viewvc/llvm-project?rev=327978&view=rev
Log:
[llvm-mca] Use llvm::make_unique in a few places. NFC
Also, clang-format a couple of DEBUG functions.
Modified:
llvm/trunk/tools/llvm-mca/Backend.cpp
llvm/trunk/tools/llvm-mca/InstrBuilder.cpp
llvm/trunk/tools/llvm-mca/InstrBuilder.h
llvm/trunk/tools/llvm-mca/Instruction.h
Modified: llvm/trunk/tools/llvm-mca/Backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/Backend.cpp?rev=327978&r1=327977&r2=327978&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mca/Backend.cpp (original)
+++ llvm/trunk/tools/llvm-mca/Backend.cpp Tue Mar 20 05:58:34 2018
@@ -33,8 +33,8 @@ void Backend::runCycle(unsigned Cycle) {
while (SM.hasNext()) {
InstRef IR = SM.peekNext();
- std::unique_ptr<Instruction> NewIS(
- IB->createInstruction(IR.first, *IR.second));
+ std::unique_ptr<Instruction> NewIS =
+ IB->createInstruction(IR.first, *IR.second);
const InstrDesc &Desc = NewIS->getDesc();
if (!DU->isAvailable(Desc.NumMicroOps) ||
!DU->canDispatch(IR.first, *NewIS))
@@ -80,5 +80,4 @@ void Backend::notifyCycleEnd(unsigned Cy
for (HWEventListener *Listener : Listeners)
Listener->onCycleEnd(Cycle);
}
-
} // namespace mca.
Modified: llvm/trunk/tools/llvm-mca/InstrBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/InstrBuilder.cpp?rev=327978&r1=327977&r2=327978&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mca/InstrBuilder.cpp (original)
+++ llvm/trunk/tools/llvm-mca/InstrBuilder.cpp Tue Mar 20 05:58:34 2018
@@ -112,12 +112,12 @@ initializeUsedResources(InstrDesc &ID, c
}
}
- DEBUG(
+ DEBUG({
for (const std::pair<uint64_t, ResourceUsage> &R : ID.Resources)
dbgs() << "\t\tMask=" << R.first << ", cy=" << R.second.size() << '\n';
for (const uint64_t R : ID.Buffers)
dbgs() << "\t\tBuffer Mask=" << R << '\n';
- );
+ });
}
static void computeMaxLatency(InstrDesc &ID, const MCInstrDesc &MCDesc,
@@ -260,11 +260,10 @@ static void populateWrites(InstrDesc &ID
}
Write.FullyUpdatesSuperRegs = FullyUpdatesSuperRegisters;
Write.IsOptionalDef = false;
- DEBUG(
- dbgs() << "\t\tOpIdx=" << Write.OpIndex
- << ", Latency=" << Write.Latency << ", WriteResourceID="
- << Write.SClassOrWriteResourceID << '\n';
- );
+ DEBUG({
+ dbgs() << "\t\tOpIdx=" << Write.OpIndex << ", Latency=" << Write.Latency
+ << ", WriteResourceID=" << Write.SClassOrWriteResourceID << '\n';
+ });
CurrentDef++;
}
@@ -371,7 +370,7 @@ void InstrBuilder::createInstrDescImpl(c
*SM.getSchedClassDesc(MCDesc.getSchedClass());
// Create a new empty descriptor.
- InstrDesc *ID = new InstrDesc();
+ std::unique_ptr<InstrDesc> ID = llvm::make_unique<InstrDesc>();
if (SCDesc.isVariant()) {
errs() << "warning: don't know how to model variant opcodes.\n"
@@ -406,7 +405,7 @@ void InstrBuilder::createInstrDescImpl(c
DEBUG(dbgs() << "\t\tNumMicroOps=" << ID->NumMicroOps << '\n');
// Now add the new descriptor.
- Descriptors[Opcode] = std::unique_ptr<const InstrDesc>(ID);
+ Descriptors[Opcode] = std::move(ID);
}
const InstrDesc &InstrBuilder::getOrCreateInstrDesc(const MCInst &MCI) {
@@ -416,9 +415,10 @@ const InstrDesc &InstrBuilder::getOrCrea
return *Descriptors[MCI.getOpcode()].get();
}
-Instruction *InstrBuilder::createInstruction(unsigned Idx, const MCInst &MCI) {
+std::unique_ptr<Instruction>
+InstrBuilder::createInstruction(unsigned Idx, const MCInst &MCI) {
const InstrDesc &D = getOrCreateInstrDesc(MCI);
- Instruction *NewIS = new Instruction(D);
+ std::unique_ptr<Instruction> NewIS = llvm::make_unique<Instruction>(D);
// Populate Reads first.
for (const ReadDescriptor &RD : D.Reads) {
@@ -441,8 +441,7 @@ Instruction *InstrBuilder::createInstruc
// Okay, this is a register operand. Create a ReadState for it.
assert(RegID > 0 && "Invalid register ID found!");
- ReadState *NewRDS = new ReadState(RD, RegID);
- NewIS->getUses().emplace_back(std::unique_ptr<ReadState>(NewRDS));
+ NewIS->getUses().emplace_back(llvm::make_unique<ReadState>(RD, RegID));
}
// Now populate writes.
@@ -455,12 +454,9 @@ Instruction *InstrBuilder::createInstruc
if (WD.IsOptionalDef && !RegID)
continue;
- WriteState *NewWS = new WriteState(WD);
- NewIS->getDefs().emplace_back(std::unique_ptr<WriteState>(NewWS));
- NewWS->setRegisterID(RegID);
+ NewIS->getDefs().emplace_back(llvm::make_unique<WriteState>(WD, RegID));
}
return NewIS;
}
-
} // namespace mca
Modified: llvm/trunk/tools/llvm-mca/InstrBuilder.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/InstrBuilder.h?rev=327978&r1=327977&r2=327978&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mca/InstrBuilder.h (original)
+++ llvm/trunk/tools/llvm-mca/InstrBuilder.h Tue Mar 20 05:58:34 2018
@@ -53,7 +53,8 @@ public:
const InstrDesc &getOrCreateInstrDesc(const llvm::MCInst &MCI);
- Instruction *createInstruction(unsigned Idx, const llvm::MCInst &MCI);
+ std::unique_ptr<Instruction> createInstruction(unsigned Idx,
+ const llvm::MCInst &MCI);
};
} // namespace mca
Modified: llvm/trunk/tools/llvm-mca/Instruction.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/Instruction.h?rev=327978&r1=327977&r2=327978&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mca/Instruction.h (original)
+++ llvm/trunk/tools/llvm-mca/Instruction.h Tue Mar 20 05:58:34 2018
@@ -102,8 +102,8 @@ class WriteState {
std::set<std::pair<ReadState *, int>> Users;
public:
- WriteState(const WriteDescriptor &Desc)
- : WD(Desc), CyclesLeft(UNKNOWN_CYCLES), RegisterID(Desc.RegisterID) {}
+ WriteState(const WriteDescriptor &Desc, unsigned RegID)
+ : WD(Desc), CyclesLeft(UNKNOWN_CYCLES), RegisterID(RegID) {}
WriteState(const WriteState &Other) = delete;
WriteState &operator=(const WriteState &Other) = delete;
More information about the llvm-commits
mailing list