Skip to content

Commit

Permalink
[llvm-mca] Fix perf regression after r332390.
Browse files Browse the repository at this point in the history
Revision 332390 introduced a FetchStage class in llvm-mca.
By design, FetchStage owns all the instructions in-flight in the OoO Backend.

Before this change, new instructions were added to a DenseMap indexed by
instruction id. The problem with using a DenseMap is that elements are not
ordered by key. This was causing a massive slow down in method
FetchStage::postExecute(), which searches for instructions retired that can be
deleted.

This patch replaces the DenseMap with a std::map ordered by instruction index.
At the end of every cycle, we search for the first instruction which is not
marked as "retired", and we remove all the previous instructions before it.
This works well because instructions are retired in-order.

Before this patch, a debug build of llvm-mca (on my Ryzen linux machine) took
~8.0 seconds to simulate 3000 iterations of a x86 dot-product (a `vmulps,
vpermilps, vaddps, vpermilps, vaddps` sequence). With this patch, it now takes
~0.8s to run all the 3000 iterations.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@332461 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
Andrea Di Biagio authored and Andrea Di Biagio committed May 16, 2018
1 parent f392447 commit fb66864
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
10 changes: 7 additions & 3 deletions tools/llvm-mca/FetchStage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,12 @@ bool FetchStage::execute(InstRef &IR) {
}

void FetchStage::postExecute(const InstRef &IR) {
// Reclaim instructions that have been retired.
llvm::remove_if(Instructions,
[](InstMapPr &Pr) { return Pr.getSecond()->isRetired(); });
// Find the first instruction which hasn't been retired.
const InstMap::iterator It =
llvm::find_if(Instructions, [](const InstMap::value_type &KeyValuePair) {
return !KeyValuePair.second->isRetired();
});
if (It != Instructions.begin())
Instructions.erase(Instructions.begin(), It);
SM.updateNext();
}
6 changes: 2 additions & 4 deletions tools/llvm-mca/FetchStage.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@
#include "Instruction.h"
#include "SourceMgr.h"
#include "Stage.h"
#include "llvm/ADT/DenseMap.h"
#include <map>

namespace mca {

class FetchStage : public Stage {
using InstMap = llvm::DenseMap<unsigned, std::unique_ptr<Instruction>>;
using InstMapPr =
llvm::detail::DenseMapPair<unsigned, std::unique_ptr<Instruction>>;
using InstMap = std::map<unsigned, std::unique_ptr<Instruction>>;
InstMap Instructions;
InstrBuilder &IB;
SourceMgr &SM;
Expand Down

0 comments on commit fb66864

Please sign in to comment.