Merge branch 'sverker/proc-dict-atom-hash/PR-1194'

* sverker/proc-dict-atom-hash:
  kernel: Add test pdict_SUITE:literals
  erts: Refactor process dict hash pre-calculation
  Use atom value as hash value in process dictionary

4 files changed, 79 insertions, 9 deletions

diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index 13552ae88c..ee40c308ce 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -39,6 +39,7 @@
 #include "erl_binary.h"
 #include "erl_zlib.h"
 #include "erl_map.h"
+#include "erl_process_dict.h"
 
 #ifdef HIPE
 #include "hipe_bif0.h"
@@ -4346,22 +4347,25 @@ gen_get_map_element(LoaderState* stp, GenOpArg Fail, GenOpArg Src,
 static int
 hash_internal_genop_arg(LoaderState* stp, GenOpArg Key, Uint32* hx)
 {
+    Eterm key_term;
     switch (Key.type) {
     case TAG_a:
-	*hx = atom_tab(atom_val(Key.val))->slot.bucket.hvalue;
-	return 1;
+	key_term = Key.val;
+        break;
     case TAG_i:
-	*hx = Key.val;
-	return 1;
+	key_term = make_small(Key.val);
+        break;
     case TAG_n:
-	*hx = make_internal_hash(NIL);
-	return 1;
+        key_term = NIL;
+        break;
     case TAG_q:
-	*hx = make_internal_hash(stp->literals[Key.val].term);
-	return 1;
+	key_term = stp->literals[Key.val].term;
+	break;
     default:
 	return 0;
     }
+    *hx = erts_pd_make_hx(key_term);
+    return 1;
 }
 
 
diff --git a/erts/emulator/beam/erl_process_dict.c b/erts/emulator/beam/erl_process_dict.c
index d8c2eaba94..d443fff22c 100644
--- a/erts/emulator/beam/erl_process_dict.c
+++ b/erts/emulator/beam/erl_process_dict.c
@@ -56,7 +56,7 @@
 #define MAKE_HASH(Term)                                \
     ((is_small(Term)) ? unsigned_val(Term) :           \
      ((is_atom(Term)) ?                                \
-      (atom_tab(atom_val(Term))->slot.bucket.hvalue) : \
+      atom_val(Term) :								   \
       make_internal_hash(Term)))
 
 #define PD_SZ2BYTES(Sz) (sizeof(ProcDict) + ((Sz) - 1)*sizeof(Eterm))
@@ -408,6 +408,11 @@ static void pd_hash_erase_all(Process *p)
     }
 }
 
+Uint32 erts_pd_make_hx(Eterm key)
+{
+    return MAKE_HASH(key);
+}
+
 Eterm erts_pd_hash_get_with_hx(Process *p, Uint32 hx, Eterm id)
 {
     unsigned int hval;
diff --git a/erts/emulator/beam/erl_process_dict.h b/erts/emulator/beam/erl_process_dict.h
index 387562058c..db5e1c7442 100644
--- a/erts/emulator/beam/erl_process_dict.h
+++ b/erts/emulator/beam/erl_process_dict.h
@@ -43,6 +43,7 @@ void erts_deep_dictionary_dump(int to, void *to_arg,
 Eterm erts_dictionary_copy(struct process *p, ProcDict *pd);
 
 Eterm erts_pd_hash_get(struct process *p, Eterm id);
+Uint32 erts_pd_make_hx(Eterm key);
 Eterm erts_pd_hash_get_with_hx(Process *p, Uint32 hx, Eterm id);
 
 #endif
diff --git a/lib/kernel/test/pdict_SUITE.erl b/lib/kernel/test/pdict_SUITE.erl
index 638d99176e..d105952df9 100644
--- a/lib/kernel/test/pdict_SUITE.erl
+++ b/lib/kernel/test/pdict_SUITE.erl
@@ -32,10 +32,13 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 mixed/1,
+         literals/1,
 	 simple/1, complicated/1, heavy/1, simple_all_keys/1, info/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 -export([other_process/2]).
 
+-export([put_do/2, get_do/1, erase_do/1]).
+
 init_per_testcase(_Case, Config) ->
     Config.
 
@@ -48,6 +51,7 @@ suite() ->
 
 all() -> 
     [simple, complicated, heavy, simple_all_keys, info,
+     literals,
      mixed].
 
 groups() -> 
@@ -418,3 +422,59 @@ do_mixed([GoalN | _]=Goals, CurrN, Array0, C, Rand0) ->
 	    Array2 = array:resize(CurrN-1, Array1),
 	    do_mixed(Goals, CurrN-1, Array2, C+1, Rand2)
     end.
+
+%% Test hash precalculation of literal keys
+literals(_Config) ->
+    %% Put literal -> get variable
+    put(1742, "1742"),
+    "1742" = ?MODULE:get_do(1742),
+    "1742" = ?MODULE:erase_do(1742),
+
+    put(-1742, "-1742"),
+    "-1742" = ?MODULE:get_do(-1742),
+    "-1742" = ?MODULE:erase_do(-1742),
+
+    put([], "NIL"),
+    "NIL" = ?MODULE:get_do([]),
+    "NIL" = ?MODULE:erase_do([]),
+
+    put(<<"binary">>, "binary"),
+    "binary" = ?MODULE:get_do(<<"binary">>),
+    "binary" = ?MODULE:erase_do(<<"binary">>),
+
+    BigBin = <<"A large binary with a lot of bytes to make it go off heap as shared and reference counted">>,
+    put(BigBin, "bigbin"),
+    "bigbin" = ?MODULE:get_do(BigBin),
+    "bigbin" = ?MODULE:erase_do(BigBin),
+
+    %% Put variable -> get literal
+    ?MODULE:put_do(4217, "4217"),
+    "4217" = get(4217),
+    "4217" = erase(4217),
+
+    ?MODULE:put_do(-4217, "-4217"),
+    "-4217" = get(-4217),
+    "-4217" = erase(-4217),
+
+    ?MODULE:put_do([], "NIL"),
+    "NIL" = get([]),
+    "NIL" = erase([]),
+
+    ?MODULE:put_do(<<"bytes">>, "bytes"),
+    "bytes" = get(<<"bytes">>),
+    "bytes" = erase(<<"bytes">>),
+
+    ?MODULE:put_do(BigBin, "BigBin"),
+    "BigBin" = get(BigBin),
+    "BigBin" = erase(BigBin),
+
+    ok.
+
+put_do(K, V) ->
+    put(K, V).
+
+get_do(K) ->
+    get(K).
+
+erase_do(K) ->
+    erase(K).