Merge branch 'rickard/ethread-rewrite/OTP-8544' into dev

* rickard/ethread-rewrite/OTP-8544:
  Rewrite ethread library

1 files changed, 358 insertions, 3 deletions

diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl
index ab727b7cb1..4f4458802c 100644
--- a/erts/emulator/test/scheduler_SUITE.erl
+++ b/erts/emulator/test/scheduler_SUITE.erl
@@ -33,7 +33,7 @@
 -include("test_server.hrl").
 
 %-compile(export_all).
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-export([all/1, init_per_testcase/2, fin_per_testcase/2, end_per_suite/1]).
 
 -export([equal/1,
 	 few_low/1,
@@ -49,7 +49,8 @@
 	 cpu_topology/1,
 	 sct_cmd/1,
 	 sbt_cmd/1,
-	 scheduler_suspend/1]).
+	 scheduler_suspend/1,
+	 reader_groups/1]).
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(10)).
 
@@ -67,7 +68,8 @@ all(suite) ->
      equal_with_high_max,
      bound_process,
      scheduler_bind,
-     scheduler_suspend].
+     scheduler_suspend,
+     reader_groups].
 
 init_per_testcase(Case, Config) when is_list(Config) ->
     Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
@@ -81,6 +83,10 @@ fin_per_testcase(_Case, Config) when is_list(Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
+end_per_suite(Config) ->
+    catch erts_debug:set_internal_state(available_internal_state, false),
+    Config.
+
 -define(ERTS_RUNQ_CHECK_BALANCE_REDS_PER_SCHED, (2000*2000)).
 -define(DEFAULT_TEST_REDS_PER_SCHED, 200000000).
 
@@ -965,12 +971,361 @@ sst3_loop(S, N) ->
     erlang:system_flag(schedulers_online, 1),
     erlang:system_flag(schedulers_online, S),
     sst3_loop(S, N-1).
+
+reader_groups(Config) when is_list(Config) ->
+    %% White box testing. These results are correct, but other results
+    %% could be too...
+
+    %% The actual tilepro64 topology
+    CPUT0 = [{processor,[{node,[{core,{logical,0}},
+				{core,{logical,1}},
+				{core,{logical,2}},
+				{core,{logical,8}},
+				{core,{logical,9}},
+				{core,{logical,10}},
+				{core,{logical,11}},
+				{core,{logical,16}},
+				{core,{logical,17}},
+				{core,{logical,18}},
+				{core,{logical,19}},
+				{core,{logical,24}},
+				{core,{logical,25}},
+				{core,{logical,27}},
+				{core,{logical,29}}]},
+			 {node,[{core,{logical,3}},
+				{core,{logical,4}},
+				{core,{logical,5}},
+				{core,{logical,6}},
+				{core,{logical,7}},
+				{core,{logical,12}},
+				{core,{logical,13}},
+				{core,{logical,14}},
+				{core,{logical,15}},
+				{core,{logical,20}},
+				{core,{logical,21}},
+				{core,{logical,22}},
+				{core,{logical,23}},
+				{core,{logical,28}},
+				{core,{logical,30}}]},
+			 {node,[{core,{logical,31}},
+				{core,{logical,36}},
+				{core,{logical,37}},
+				{core,{logical,38}},
+				{core,{logical,44}},
+				{core,{logical,45}},
+				{core,{logical,46}},
+				{core,{logical,47}},
+				{core,{logical,51}},
+				{core,{logical,52}},
+				{core,{logical,53}},
+				{core,{logical,54}},
+				{core,{logical,55}},
+				{core,{logical,60}},
+				{core,{logical,61}}]},
+			 {node,[{core,{logical,26}},
+				{core,{logical,32}},
+				{core,{logical,33}},
+				{core,{logical,34}},
+				{core,{logical,35}},
+				{core,{logical,39}},
+				{core,{logical,40}},
+				{core,{logical,41}},
+				{core,{logical,42}},
+				{core,{logical,43}},
+				{core,{logical,48}},
+				{core,{logical,49}},
+				{core,{logical,50}},
+				{core,{logical,58}}]}]}],
+
+    ?line [{0,1},{1,1},{2,1},{3,3},{4,3},{5,3},{6,3},{7,3},{8,1},{9,1},{10,1},
+	   {11,1},{12,3},{13,3},{14,4},{15,4},{16,2},{17,2},{18,2},{19,2},
+	   {20,4},{21,4},{22,4},{23,4},{24,2},{25,2},{26,7},{27,2},{28,4},
+	   {29,2},{30,4},{31,5},{32,7},{33,7},{34,7},{35,7},{36,5},{37,5},
+	   {38,5},{39,7},{40,7},{41,8},{42,8},{43,8},{44,5},{45,5},{46,5},
+	   {47,6},{48,8},{49,8},{50,8},{51,6},{52,6},{53,6},{54,6},{55,6},
+	   {58,8},{60,6},{61,6}]
+	= reader_groups_map(CPUT0, 8),
+
+    CPUT1 = [n([p([c([t(l(0)),t(l(1)),t(l(2)),t(l(3))]),
+		   c([t(l(4)),t(l(5)),t(l(6)),t(l(7))]),
+		   c([t(l(8)),t(l(9)),t(l(10)),t(l(11))]),
+		   c([t(l(12)),t(l(13)),t(l(14)),t(l(15))])]),
+		p([c([t(l(16)),t(l(17)),t(l(18)),t(l(19))]),
+		   c([t(l(20)),t(l(21)),t(l(22)),t(l(23))]),
+		   c([t(l(24)),t(l(25)),t(l(26)),t(l(27))]),
+		   c([t(l(28)),t(l(29)),t(l(30)),t(l(31))])])]),
+	     n([p([c([t(l(32)),t(l(33)),t(l(34)),t(l(35))]),
+		   c([t(l(36)),t(l(37)),t(l(38)),t(l(39))]),
+		   c([t(l(40)),t(l(41)),t(l(42)),t(l(43))]),
+		   c([t(l(44)),t(l(45)),t(l(46)),t(l(47))])]),
+		p([c([t(l(48)),t(l(49)),t(l(50)),t(l(51))]),
+		   c([t(l(52)),t(l(53)),t(l(54)),t(l(55))]),
+		   c([t(l(56)),t(l(57)),t(l(58)),t(l(59))]),
+		   c([t(l(60)),t(l(61)),t(l(62)),t(l(63))])])]),
+	     n([p([c([t(l(64)),t(l(65)),t(l(66)),t(l(67))]),
+		   c([t(l(68)),t(l(69)),t(l(70)),t(l(71))]),
+		   c([t(l(72)),t(l(73)),t(l(74)),t(l(75))]),
+		   c([t(l(76)),t(l(77)),t(l(78)),t(l(79))])]),
+		p([c([t(l(80)),t(l(81)),t(l(82)),t(l(83))]),
+		   c([t(l(84)),t(l(85)),t(l(86)),t(l(87))]),
+		   c([t(l(88)),t(l(89)),t(l(90)),t(l(91))]),
+		   c([t(l(92)),t(l(93)),t(l(94)),t(l(95))])])]),
+	     n([p([c([t(l(96)),t(l(97)),t(l(98)),t(l(99))]),
+		   c([t(l(100)),t(l(101)),t(l(102)),t(l(103))]),
+		   c([t(l(104)),t(l(105)),t(l(106)),t(l(107))]),
+		   c([t(l(108)),t(l(109)),t(l(110)),t(l(111))])]),
+		p([c([t(l(112)),t(l(113)),t(l(114)),t(l(115))]),
+		   c([t(l(116)),t(l(117)),t(l(118)),t(l(119))]),
+		   c([t(l(120)),t(l(121)),t(l(122)),t(l(123))]),
+		   c([t(l(124)),t(l(125)),t(l(126)),t(l(127))])])])],
+
+    ?line [{0,1},{1,1},{2,1},{3,1},{4,2},{5,2},{6,2},{7,2},{8,3},{9,3},
+	   {10,3},{11,3},{12,4},{13,4},{14,4},{15,4},{16,5},{17,5},{18,5},
+	   {19,5},{20,6},{21,6},{22,6},{23,6},{24,7},{25,7},{26,7},{27,7},
+	   {28,8},{29,8},{30,8},{31,8},{32,9},{33,9},{34,9},{35,9},{36,10},
+	   {37,10},{38,10},{39,10},{40,11},{41,11},{42,11},{43,11},{44,12},
+	   {45,12},{46,12},{47,12},{48,13},{49,13},{50,13},{51,13},{52,14},
+	   {53,14},{54,14},{55,14},{56,15},{57,15},{58,15},{59,15},{60,16},
+	   {61,16},{62,16},{63,16},{64,17},{65,17},{66,17},{67,17},{68,18},
+	   {69,18},{70,18},{71,18},{72,19},{73,19},{74,19},{75,19},{76,20},
+	   {77,20},{78,20},{79,20},{80,21},{81,21},{82,21},{83,21},{84,22},
+	   {85,22},{86,22},{87,22},{88,23},{89,23},{90,23},{91,23},{92,24},
+	   {93,24},{94,24},{95,24},{96,25},{97,25},{98,25},{99,25},{100,26},
+	   {101,26},{102,26},{103,26},{104,27},{105,27},{106,27},{107,27},
+	   {108,28},{109,28},{110,28},{111,28},{112,29},{113,29},{114,29},
+	   {115,29},{116,30},{117,30},{118,30},{119,30},{120,31},{121,31},
+	   {122,31},{123,31},{124,32},{125,32},{126,32},{127,32}]
+	= reader_groups_map(CPUT1, 128),
+
+    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},{8,1},{9,1},{10,1},
+	   {11,1},{12,1},{13,1},{14,1},{15,1},{16,1},{17,1},{18,1},{19,1},
+	   {20,1},{21,1},{22,1},{23,1},{24,1},{25,1},{26,1},{27,1},{28,1},
+	   {29,1},{30,1},{31,1},{32,1},{33,1},{34,1},{35,1},{36,1},{37,1},
+	   {38,1},{39,1},{40,1},{41,1},{42,1},{43,1},{44,1},{45,1},{46,1},
+	   {47,1},{48,1},{49,1},{50,1},{51,1},{52,1},{53,1},{54,1},{55,1},
+	   {56,1},{57,1},{58,1},{59,1},{60,1},{61,1},{62,1},{63,1},{64,2},
+	   {65,2},{66,2},{67,2},{68,2},{69,2},{70,2},{71,2},{72,2},{73,2},
+	   {74,2},{75,2},{76,2},{77,2},{78,2},{79,2},{80,2},{81,2},{82,2},
+	   {83,2},{84,2},{85,2},{86,2},{87,2},{88,2},{89,2},{90,2},{91,2},
+	   {92,2},{93,2},{94,2},{95,2},{96,2},{97,2},{98,2},{99,2},{100,2},
+	   {101,2},{102,2},{103,2},{104,2},{105,2},{106,2},{107,2},{108,2},
+	   {109,2},{110,2},{111,2},{112,2},{113,2},{114,2},{115,2},{116,2},
+	   {117,2},{118,2},{119,2},{120,2},{121,2},{122,2},{123,2},{124,2},
+	   {125,2},{126,2},{127,2}]
+	= reader_groups_map(CPUT1, 2),
+
+    ?line [{0,1},{1,1},{2,1},{3,1},{4,2},{5,2},{6,2},{7,2},{8,3},{9,3},{10,3},
+	   {11,3},{12,3},{13,3},{14,3},{15,3},{16,4},{17,4},{18,4},{19,4},
+	   {20,4},{21,4},{22,4},{23,4},{24,5},{25,5},{26,5},{27,5},{28,5},
+	   {29,5},{30,5},{31,5},{32,6},{33,6},{34,6},{35,6},{36,6},{37,6},
+	   {38,6},{39,6},{40,7},{41,7},{42,7},{43,7},{44,7},{45,7},{46,7},
+	   {47,7},{48,8},{49,8},{50,8},{51,8},{52,8},{53,8},{54,8},{55,8},
+	   {56,9},{57,9},{58,9},{59,9},{60,9},{61,9},{62,9},{63,9},{64,10},
+	   {65,10},{66,10},{67,10},{68,10},{69,10},{70,10},{71,10},{72,11},
+	   {73,11},{74,11},{75,11},{76,11},{77,11},{78,11},{79,11},{80,12},
+	   {81,12},{82,12},{83,12},{84,12},{85,12},{86,12},{87,12},{88,13},
+	   {89,13},{90,13},{91,13},{92,13},{93,13},{94,13},{95,13},{96,14},
+	   {97,14},{98,14},{99,14},{100,14},{101,14},{102,14},{103,14},
+	   {104,15},{105,15},{106,15},{107,15},{108,15},{109,15},{110,15},
+	   {111,15},{112,16},{113,16},{114,16},{115,16},{116,16},{117,16},
+	   {118,16},{119,16},{120,17},{121,17},{122,17},{123,17},{124,17},
+	   {125,17},{126,17},{127,17}]
+	= reader_groups_map(CPUT1, 17),
+
+    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},{8,1},{9,1},{10,1},
+	   {11,1},{12,1},{13,1},{14,1},{15,1},{16,2},{17,2},{18,2},{19,2},
+	   {20,2},{21,2},{22,2},{23,2},{24,2},{25,2},{26,2},{27,2},{28,2},
+	   {29,2},{30,2},{31,2},{32,3},{33,3},{34,3},{35,3},{36,3},{37,3},
+	   {38,3},{39,3},{40,3},{41,3},{42,3},{43,3},{44,3},{45,3},{46,3},
+	   {47,3},{48,4},{49,4},{50,4},{51,4},{52,4},{53,4},{54,4},{55,4},
+	   {56,4},{57,4},{58,4},{59,4},{60,4},{61,4},{62,4},{63,4},{64,5},
+	   {65,5},{66,5},{67,5},{68,5},{69,5},{70,5},{71,5},{72,5},{73,5},
+	   {74,5},{75,5},{76,5},{77,5},{78,5},{79,5},{80,6},{81,6},{82,6},
+	   {83,6},{84,6},{85,6},{86,6},{87,6},{88,6},{89,6},{90,6},{91,6},
+	   {92,6},{93,6},{94,6},{95,6},{96,7},{97,7},{98,7},{99,7},{100,7},
+	   {101,7},{102,7},{103,7},{104,7},{105,7},{106,7},{107,7},{108,7},
+	   {109,7},{110,7},{111,7},{112,7},{113,7},{114,7},{115,7},{116,7},
+	   {117,7},{118,7},{119,7},{120,7},{121,7},{122,7},{123,7},{124,7},
+	   {125,7},{126,7},{127,7}]
+	= reader_groups_map(CPUT1, 7),
+
+    ?line CPUT2 = [p([c(l(0)),c(l(1)),c(l(2)),c(l(3)),c(l(4))]),
+		   p([t(l(5)),t(l(6)),t(l(7)),t(l(8)),t(l(9))]),
+		   p([t(l(10))]),
+		   p([c(l(11)),c(l(12)),c(l(13))]),
+		   p([c(l(14)),c(l(15))])],
+
+    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},
+	   {5,2},{6,2},{7,2},{8,2},{9,2},
+	   {10,3},
+	   {11,4},{12,4},{13,4},
+	   {14,5},{15,5}] = reader_groups_map(CPUT2, 5),
+
+
+    ?line [{0,1},{1,1},{2,2},{3,2},{4,2},
+	   {5,3},{6,3},{7,3},{8,3},{9,3},
+	   {10,4},
+	   {11,5},{12,5},{13,5},
+	   {14,6},{15,6}] = reader_groups_map(CPUT2, 6),
+
+    ?line [{0,1},{1,1},{2,2},{3,2},{4,2},
+	   {5,3},{6,3},{7,3},{8,3},{9,3},
+	   {10,4},
+	   {11,5},{12,6},{13,6},
+	   {14,7},{15,7}] = reader_groups_map(CPUT2, 7),
+
+    ?line [{0,1},{1,1},{2,2},{3,2},{4,2},
+	   {5,3},{6,3},{7,3},{8,3},{9,3},
+	   {10,4},
+	   {11,5},{12,6},{13,6},
+	   {14,7},{15,8}] = reader_groups_map(CPUT2, 8),
+
+    ?line [{0,1},{1,2},{2,2},{3,3},{4,3},
+	   {5,4},{6,4},{7,4},{8,4},{9,4},
+	   {10,5},
+	   {11,6},{12,7},{13,7},
+	   {14,8},{15,9}] = reader_groups_map(CPUT2, 9),
+
+    ?line [{0,1},{1,2},{2,2},{3,3},{4,3},
+	   {5,4},{6,4},{7,4},{8,4},{9,4},
+	   {10,5},
+	   {11,6},{12,7},{13,8},
+	   {14,9},{15,10}] = reader_groups_map(CPUT2, 10),
+
+    ?line [{0,1},{1,2},{2,3},{3,4},{4,4},
+	   {5,5},{6,5},{7,5},{8,5},{9,5},
+	   {10,6},
+	   {11,7},{12,8},{13,9},
+	   {14,10},{15,11}] = reader_groups_map(CPUT2, 11),
+
+    ?line [{0,1},{1,2},{2,3},{3,4},{4,5},
+	   {5,6},{6,6},{7,6},{8,6},{9,6},
+	   {10,7},
+	   {11,8},{12,9},{13,10},
+	   {14,11},{15,12}] = reader_groups_map(CPUT2, 100),
+
+    CPUT3 = [p([t(l(5)),t(l(6)),t(l(7)),t(l(8)),t(l(9))]),
+	     p([t(l(10))]),
+	     p([c(l(11)),c(l(12)),c(l(13))]),
+	     p([c(l(14)),c(l(15))]),
+	     p([c(l(0)),c(l(1)),c(l(2)),c(l(3)),c(l(4))])],
+
+    ?line [{0,5},{1,5},{2,6},{3,6},{4,6},
+	   {5,1},{6,1},{7,1},{8,1},{9,1},
+	   {10,2},{11,3},{12,3},{13,3},
+	   {14,4},{15,4}] = reader_groups_map(CPUT3, 6),
+
+    CPUT4 = [p([t(l(0)),t(l(1)),t(l(2)),t(l(3)),t(l(4))]),
+	     p([t(l(5))]),
+	     p([c(l(6)),c(l(7)),c(l(8))]),
+	     p([c(l(9)),c(l(10))]),
+	     p([c(l(11)),c(l(12)),c(l(13)),c(l(14)),c(l(15))])],
+
+    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},
+	   {5,2},
+	   {6,3},{7,3},{8,3},
+	   {9,4},{10,4},
+	   {11,5},{12,5},{13,6},{14,6},{15,6}] = reader_groups_map(CPUT4, 6),
+
+    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},
+	   {5,2},
+	   {6,3},{7,4},{8,4},
+	   {9,5},{10,5},
+	   {11,6},{12,6},{13,7},{14,7},{15,7}] = reader_groups_map(CPUT4, 7),
+
+    ?line [{0,1},{65535,2}] = reader_groups_map([c(l(0)),c(l(65535))], 10),
+
+    ?line ok.
     
 
+reader_groups_map(CPUT, Groups) ->
+    Old = erlang:system_info({cpu_topology, defined}),
+    erlang:system_flag(cpu_topology, CPUT),
+    enable_internal_state(),
+    Res = erts_debug:get_internal_state({reader_groups_map, Groups}),
+    erlang:system_flag(cpu_topology, Old),
+    lists:sort(Res).
+
 %%
 %% Utils
 %%
 
+tilera_cpu_topology() ->
+    [{processor,[{node,[{core,{logical,0}},
+			{core,{logical,1}},
+			{core,{logical,2}},
+			{core,{logical,8}},
+			{core,{logical,9}},
+			{core,{logical,10}},
+			{core,{logical,11}},
+			{core,{logical,16}},
+			{core,{logical,17}},
+			{core,{logical,18}},
+			{core,{logical,19}},
+			{core,{logical,24}},
+			{core,{logical,25}},
+			{core,{logical,27}},
+			{core,{logical,29}}]},
+		 {node,[{core,{logical,3}},
+			{core,{logical,4}},
+			{core,{logical,5}},
+			{core,{logical,6}},
+			{core,{logical,7}},
+			{core,{logical,12}},
+			{core,{logical,13}},
+			{core,{logical,14}},
+			{core,{logical,15}},
+			{core,{logical,20}},
+			{core,{logical,21}},
+			{core,{logical,22}},
+			{core,{logical,23}},
+			{core,{logical,28}},
+			{core,{logical,30}}]},
+		 {node,[{core,{logical,31}},
+			{core,{logical,36}},
+			{core,{logical,37}},
+			{core,{logical,38}},
+			{core,{logical,44}},
+			{core,{logical,45}},
+			{core,{logical,46}},
+			{core,{logical,47}},
+			{core,{logical,51}},
+			{core,{logical,52}},
+			{core,{logical,53}},
+			{core,{logical,54}},
+			{core,{logical,55}},
+			{core,{logical,60}},
+			{core,{logical,61}}]},
+		 {node,[{core,{logical,26}},
+			{core,{logical,32}},
+			{core,{logical,33}},
+			{core,{logical,34}},
+			{core,{logical,35}},
+			{core,{logical,39}},
+			{core,{logical,40}},
+			{core,{logical,41}},
+			{core,{logical,42}},
+			{core,{logical,43}},
+			{core,{logical,48}},
+			{core,{logical,49}},
+			{core,{logical,50}},
+			{core,{logical,58}}]}]}].
+
+l(Id) ->
+    {logical, Id}.
+
+t(X) ->
+    {thread, X}.
+
+c(X) ->
+    {core, X}.
+
+p(X) ->
+    {processor, X}.
+
+n(X) ->
+    {node, X}.
+
 mcall(Node, Funs) ->
     Parent = self(),
     Refs = lists:map(fun (Fun) ->