wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 845068 - IonMonkey: GVN: Implement congruentTo and valueHash for more load nodes, exposing more congruences and reducing collisions r=nbp

Browse Source
This commit is contained in:
Dan Gohman 2014-07-16 10:53:38 -07:00
parent 09f8f133ba
commit 1e5e9aaf48
2 changed files with 73 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
js/src/jit/MIR.cpp
View File

@ -174,14 +174,18 @@ MDefinition::printName(FILE *fp) const
fprintf(fp, "%u", id());
}
HashNumber
MDefinition::addU32ToHash(HashNumber hash, uint32_t data)
{
return data + (hash << 6) + (hash << 16) - hash;
}
HashNumber
MDefinition::valueHash() const
{
HashNumber out = op();
for (size_t i = 0, e = numOperands(); i < e; i++) {
uint32_t valueNumber = getOperand(i)->id();
out = valueNumber + (out << 6) + (out << 16) - out;
}
for (size_t i = 0, e = numOperands(); i < e; i++)
out = addU32ToHash(out, getOperand(i)->id());
return out;
}
@ -686,7 +690,9 @@ MParameter::printOpcode(FILE *fp) const
HashNumber
MParameter::valueHash() const
{
return index_; // Why not?
HashNumber hash = MDefinition::valueHash();
hash = addU32ToHash(hash, index_);
return hash;
}
bool
@ -2866,6 +2872,14 @@ MAsmJSLoadGlobalVar::mightAlias(const MDefinition *def) const
return true;
}
HashNumber
MAsmJSLoadGlobalVar::valueHash() const
{
HashNumber hash = MDefinition::valueHash();
hash = addU32ToHash(hash, globalDataOffset_);
return hash;
}
bool
MAsmJSLoadGlobalVar::congruentTo(const MDefinition *ins) const
{
@ -2876,6 +2890,42 @@ MAsmJSLoadGlobalVar::congruentTo(const MDefinition *ins) const
return false;
}
HashNumber
MAsmJSLoadFuncPtr::valueHash() const
{
HashNumber hash = MDefinition::valueHash();
hash = addU32ToHash(hash, globalDataOffset_);
return hash;
}
bool
MAsmJSLoadFuncPtr::congruentTo(const MDefinition *ins) const
{
if (ins->isAsmJSLoadFuncPtr()) {
const MAsmJSLoadFuncPtr *load = ins->toAsmJSLoadFuncPtr();
return globalDataOffset_ == load->globalDataOffset_;
}
return false;
}
HashNumber
MAsmJSLoadFFIFunc::valueHash() const
{
HashNumber hash = MDefinition::valueHash();
hash = addU32ToHash(hash, globalDataOffset_);
return hash;
}
bool
MAsmJSLoadFFIFunc::congruentTo(const MDefinition *ins) const
{
if (ins->isAsmJSLoadFFIFunc()) {
const MAsmJSLoadFFIFunc *load = ins->toAsmJSLoadFFIFunc();
return globalDataOffset_ == load->globalDataOffset_;
}
return false;
}
bool
MLoadSlot::mightAlias(const MDefinition *store) const
{
@ -2884,6 +2934,14 @@ MLoadSlot::mightAlias(const MDefinition *store) const
return true;
}
HashNumber
MLoadSlot::valueHash() const
{
HashNumber hash = MDefinition::valueHash();
hash = addU32ToHash(hash, slot_);
return hash;
}
bool
MGuardShapePolymorphic::congruentTo(const MDefinition *ins) const
{

10
js/src/jit/MIR.h
View File

@ -360,6 +360,8 @@ class MDefinition : public MNode
block_ = block;
}
static HashNumber addU32ToHash(HashNumber hash, uint32_t data);
public:
MDefinition()
: id_(0),
@ -8111,6 +8113,7 @@ class MLoadSlot
return slot_;
}
HashNumber valueHash() const;
bool congruentTo(const MDefinition *ins) const {
if (!ins->isLoadSlot())
return false;
@ -10402,6 +10405,7 @@ class MAsmJSLoadGlobalVar : public MNullaryInstruction
unsigned globalDataOffset() const { return globalDataOffset_; }
HashNumber valueHash() const;
bool congruentTo(const MDefinition *ins) const;
AliasSet getAliasSet() const {
@ -10455,6 +10459,9 @@ class MAsmJSLoadFuncPtr : public MUnaryInstruction
unsigned globalDataOffset() const { return globalDataOffset_; }
MDefinition *index() const { return getOperand(0); }
HashNumber valueHash() const;
bool congruentTo(const MDefinition *ins) const;
};
class MAsmJSLoadFFIFunc : public MNullaryInstruction
@ -10476,6 +10483,9 @@ class MAsmJSLoadFFIFunc : public MNullaryInstruction
}
unsigned globalDataOffset() const { return globalDataOffset_; }
HashNumber valueHash() const;
bool congruentTo(const MDefinition *ins) const;
};
class MAsmJSParameter : public MNullaryInstruction