[llvm-commits] [llvm] r152116 - /llvm/trunk/lib/VMCore/ConstantsContext.h

[Duncan Sands]

Hi Jay,

> Change ConstantAggrUniqueMap to use Chandler's new hashing
> implementation. Patch by Meador Inge

> --- llvm/trunk/lib/VMCore/ConstantsContext.h (original)
> +++ llvm/trunk/lib/VMCore/ConstantsContext.h Tue Mar  6 04:43:52 2012
> @@ -16,6 +16,7 @@
>   #define LLVM_CONSTANTSCONTEXT_H
>
>   #include "llvm/ADT/DenseMap.h"
> +#include "llvm/ADT/Hashing.h"
>   #include "llvm/InlineAsm.h"
>   #include "llvm/Instructions.h"
>   #include "llvm/Operator.h"
> @@ -656,48 +657,20 @@
>         return ConstantClassInfo::getTombstoneKey();
>       }
>       static unsigned getHashValue(const ConstantClass *CP) {
> -      // This is adapted from SuperFastHash by Paul Hsieh.
> -      unsigned Hash = TypeClassInfo::getHashValue(CP->getType());
> -      for (unsigned I = 0, E = CP->getNumOperands(); I<  E; ++I) {
> -        unsigned Data = ConstantInfo::getHashValue(CP->getOperand(I));
> -        Hash         += Data&  0xFFFF;
> -        unsigned Tmp  = ((Data>>  16)<<  11) ^ Hash;
> -        Hash          = (Hash<<  16) ^ Tmp;
> -        Hash         += Hash>>  11;
> -      }
> -
> -      // Force "avalanching" of final 127 bits.
> -      Hash ^= Hash<<  3;
> -      Hash += Hash>>  5;
> -      Hash ^= Hash<<  4;
> -      Hash += Hash>>  17;
> -      Hash ^= Hash<<  25;
> -      Hash += Hash>>  6;
> -      return Hash;
> +      hash_code code = hash_value(CP->getType());
> +      for (unsigned I = 0, E = CP->getNumOperands(); I<  E; ++I)
> +        code = hash_combine(code, hash_value(CP->getOperand(I)));

maybe this could/should be done with hash_combine_range?

> +      return code;
>       }
>       static bool isEqual(const ConstantClass *LHS, const ConstantClass *RHS) {
>         return LHS == RHS;
>       }
>       static unsigned getHashValue(const LookupKey&Val) {
> -      // This is adapted from SuperFastHash by Paul Hsieh.
> -      unsigned Hash = TypeClassInfo::getHashValue(Val.first);
> +      hash_code code = hash_value(Val.first);
>         for (Operands::const_iterator
> -        I = Val.second.begin(), E = Val.second.end(); I != E; ++I) {
> -        unsigned Data = ConstantInfo::getHashValue(*I);
> -        Hash         += Data&  0xFFFF;
> -        unsigned Tmp  = ((Data>>  16)<<  11) ^ Hash;
> -        Hash          = (Hash<<  16) ^ Tmp;
> -        Hash         += Hash>>  11;
> -      }
> -
> -      // Force "avalanching" of final 127 bits.
> -      Hash ^= Hash<<  3;
> -      Hash += Hash>>  5;
> -      Hash ^= Hash<<  4;
> -      Hash += Hash>>  17;
> -      Hash ^= Hash<<  25;
> -      Hash += Hash>>  6;
> -      return Hash;
> +           I = Val.second.begin(), E = Val.second.end(); I != E; ++I)
> +        code = hash_combine(code, hash_value(*I));

Likewise.

Ciao, Duncan.

> +      return code;
>       }
>       static bool isEqual(const LookupKey&LHS, const ConstantClass *RHS) {
>         if (RHS == getEmptyKey() || RHS == getTombstoneKey())
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits