File 0377-megaco-test-Add-HW-analyzis-for-Apple-M1.p... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0377-megaco-test-Add-HW-analyzis-for-Apple-M1.patch of Package erlang (Revision 62614e362dc3ec433dd252b94460863a)

Currently displaying revision 62614e362dc3ec433dd252b94460863a , Show latest

From 98e9eaee192845c6aeb59e96564329a888a2f68b Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 11 Jan 2022 16:31:56 +0100
Subject: [PATCH 07/13] [megaco|test] Add HW analyzis for Apple M1

OTP-17839
---
 lib/megaco/test/megaco_examples_SUITE.erl | 14 +++--
 lib/megaco/test/megaco_test_lib.erl       | 73 ++++++++++++++++++++++-
 2 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/lib/megaco/test/megaco_examples_SUITE.erl b/lib/megaco/test/megaco_examples_SUITE.erl
index bdeac47696..4acc933c25 100644
--- a/lib/megaco/test/megaco_examples_SUITE.erl
+++ b/lib/megaco/test/megaco_examples_SUITE.erl
@@ -602,18 +602,20 @@ meas(Config) when is_list(Config) ->
     {Time, Factor} =
         if
             (MFactor =:= 1) ->
-                {2, 100};
-            (MFactor =:= 2) ->
                 {3, 100};
+            (MFactor =:= 2) ->
+                {4, 100};
             (MFactor =:= 3) ->
-                {3, 200};
-            (MFactor =:= 4) ->
                 {4, 200};
             (MFactor =:= 4) ->
-                {4, 400};
+                {5, 200};
+            (MFactor =:= 5) ->
+                {5, 400};
             true ->
-                {5, 400}
+                {6, 400}
         end,
+    p("      Timetrap: ~p mins"
+      "~n      Factor:   ~p", [Time, Factor]),
     ct:timetrap(?MINS(Time)),
     WorkerNode = ?config(worker_node, Config),
     do_meas(?FUNCTION_NAME, WorkerNode, megaco_codec_meas, start, [Factor]).
diff --git a/lib/megaco/test/megaco_test_lib.erl b/lib/megaco/test/megaco_test_lib.erl
index 89c57b2e6e..1192cc192e 100644
--- a/lib/megaco/test/megaco_test_lib.erl
+++ b/lib/megaco/test/megaco_test_lib.erl
@@ -940,7 +940,7 @@ linux_which_cpuinfo(wind_river) ->
     end;
 
 linux_which_cpuinfo(other) ->
-    %% Check for x86 (Intel or AMD)
+    %% Check for x86 (Intel or AMD or Power)
     CPU =
         case linux_cpuinfo_model_name() of
             "-" ->
@@ -1447,13 +1447,23 @@ analyze_darwin_hw_model_identifier(HwInfo) ->
     proplists:get_value("model identifier", HwInfo, "-").
 
 analyze_darwin_hw_processor_name(HwInfo) ->
-    proplists:get_value("processor name", HwInfo, "-").
+    case proplists:get_value("processor name", HwInfo, "-") of
+        "-" ->
+            proplists:get_value("chip", HwInfo, "-");
+        N ->
+            N
+    end.
 
 analyze_darwin_hw_processor_speed(HwInfo) ->
     proplists:get_value("processor speed", HwInfo, "-").
 
 analyze_darwin_hw_number_of_processors(HwInfo) ->
-    proplists:get_value("number of processors", HwInfo, "-").
+    case analyze_darwin_hw_processor_name(HwInfo) of
+        "Apple M" ++ _ ->
+            proplists:get_value("number of processors", HwInfo, "1");
+        _ ->
+            proplists:get_value("number of processors", HwInfo, "-")
+    end.
 
 analyze_darwin_hw_total_number_of_cores(HwInfo) ->
     proplists:get_value("total number of cores", HwInfo, "-").
@@ -1534,8 +1544,65 @@ analyze_darwin_memory_to_factor(Mem) ->
 %% the speed may be a float, which we transforms into an integer of MHz.
 %% To calculate a factor based on processor speed, number of procs
 %% and number of cores is ... not an exact ... science ...
+%%
+%% If Apple processor, we don't know the speed, so ignore that for now...
+analyze_darwin_cpu_to_factor("Apple M" ++ _ = _ProcName,
+                             _ProcSpeedStr, NumProcStr, NumCoresStr) ->
+    %% io:format("analyze_darwin_cpu_to_factor(apple) -> entry with"
+    %%           "~n  ProcName:     ~p"
+    %%           "~n  ProcSpeedStr: ~p"
+    %%           "~n  NumProcStr:   ~p"
+    %%           "~n  NumCoresStr:  ~p"
+    %%           "~n", [_ProcName, _ProcSpeedStr, NumProcStr, NumCoresStr]),
+    NumProc = try list_to_integer(NumProcStr) of
+                  NumProcI ->
+                      NumProcI
+              catch
+                  _:_:_ ->
+                      1
+              end,
+    %% This is a string that looks like this: X (Y performance and Z efficiency)
+    NumCores = try string:tokens(NumCoresStr, [$\ ]) of
+                   [NCStr | _] ->
+                       try list_to_integer(NCStr) of
+                           NumCoresI ->
+                               NumCoresI
+                       catch
+                           _:_:_ ->
+                               1
+                       end
+               catch
+                   _:_:_ ->
+                       1
+               end,
+    if
+        (NumProc =:= 1) ->
+            if
+                (NumCores < 2) ->
+                    5;
+                (NumCores < 4) ->
+                    3;
+                (NumCores < 6) ->
+                    2;
+                true ->
+                    1
+            end;
+        true ->
+            if
+                (NumCores < 4) ->
+                    2;
+                true ->
+                    1
+            end
+    end;
 analyze_darwin_cpu_to_factor(_ProcName,
                              ProcSpeedStr, NumProcStr, NumCoresStr) ->
+    %% io:format("analyze_darwin_cpu_to_factor -> entry with"
+    %%           "~n  ProcName:     ~p"
+    %%           "~n  ProcSpeedStr: ~p"
+    %%           "~n  NumProcStr:   ~p"
+    %%           "~n  NumCoresStr:  ~p"
+    %%           "~n", [_ProcName, ProcSpeedStr, NumProcStr, NumCoresStr]),
     Speed = 
         case [string:to_lower(S) || S <- string:tokens(ProcSpeedStr, [$\ ])] of
             [SpeedStr, "mhz"] ->
-- 
2.31.1

Places

File 0377-megaco-test-Add-HW-analyzis-for-Apple-M1.patch of Package erlang (Revision 62614e362dc3ec433dd252b94460863a)

Places