summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorTobias Klausmann <tobias.johannes.klausmann@mni.thm.de>2014-07-08 04:19:13 +0200
committerIlia Mirkin <imirkin@alum.mit.edu>2014-07-08 19:41:00 -0400
commita9b21015f5e3a6a37e53a8b3c755519f7b70479e (patch)
tree8d8534a6853c03d67c08cdcffc4fe20f831a48dc /src/gallium
parent503391b46f753e1f8c0bc771776a51719d0507e4 (diff)
nv50/ir: use unordered_set instead of list to keep track of var uses
The set of variable uses does not need to be ordered in any way, and removing/adding elements is a fairly common operation in various optimization passes. This shortens runtime of piglit test fp-long-alu to ~22s from ~4h Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir.cpp6
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir.h7
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp2
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp4
4 files changed, 10 insertions, 9 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
index 13f8cf20c76..ca3c806e92f 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
@@ -141,9 +141,9 @@ ValueRef::set(Value *refVal)
if (value == refVal)
return;
if (value)
- value->uses.remove(this);
+ value->uses.erase(this);
if (refVal)
- refVal->uses.push_back(this);
+ refVal->uses.insert(this);
value = refVal;
}
@@ -206,7 +206,7 @@ ValueDef::replace(const ValueRef &repVal, bool doSet)
return;
while (!value->uses.empty()) {
- ValueRef *ref = value->uses.front();
+ ValueRef *ref = *value->uses.begin();
ref->set(repVal.get());
ref->mod *= repVal.mod;
}
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.h b/src/gallium/drivers/nouveau/codegen/nv50_ir.h
index 88440309e6b..0ff5e5dc3b2 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir.h
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.h
@@ -29,6 +29,7 @@
#include <deque>
#include <list>
#include <vector>
+#include <tr1/unordered_set>
#include "codegen/nv50_ir_util.h"
#include "codegen/nv50_ir_graph.h"
@@ -581,10 +582,10 @@ public:
static inline Value *get(Iterator&);
- std::list<ValueRef *> uses;
+ std::tr1::unordered_set<ValueRef *> uses;
std::list<ValueDef *> defs;
- typedef std::list<ValueRef *>::iterator UseIterator;
- typedef std::list<ValueRef *>::const_iterator UseCIterator;
+ typedef std::tr1::unordered_set<ValueRef *>::iterator UseIterator;
+ typedef std::tr1::unordered_set<ValueRef *>::const_iterator UseCIterator;
typedef std::list<ValueDef *>::iterator DefIterator;
typedef std::list<ValueDef *>::const_iterator DefCIterator;
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
index b89da43136e..1a9a25fa7ec 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
@@ -686,7 +686,7 @@ ConstantFolding::tryCollapseChainedMULs(Instruction *mul2,
// b = mul a, imm
// d = mul b, c -> d = mul_x_imm a, c
int s2, t2;
- insn = mul2->getDef(0)->uses.front()->getInsn();
+ insn = (*mul2->getDef(0)->uses.begin())->getInsn();
if (!insn)
return;
mul1 = mul2;
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
index e4f56b140da..6c83a608234 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
@@ -983,7 +983,7 @@ GCRA::doCoalesce(ArrayList& insns, unsigned int mask)
break;
i = NULL;
if (!insn->getDef(0)->uses.empty())
- i = insn->getDef(0)->uses.front()->getInsn();
+ i = (*insn->getDef(0)->uses.begin())->getInsn();
// if this is a contraint-move there will only be a single use
if (i && i->op == OP_MERGE) // do we really still need this ?
break;
@@ -1559,7 +1559,7 @@ SpillCodeInserter::run(const std::list<ValuePair>& lst)
// Unspill at each use *before* inserting spill instructions,
// we don't want to have the spill instructions in the use list here.
while (!dval->uses.empty()) {
- ValueRef *u = dval->uses.front();
+ ValueRef *u = *dval->uses.begin();
Instruction *usei = u->getInsn();
assert(usei);
if (usei->isPseudo()) {