Revert "Revert "added system memory info""

This reverts commit dbeae11.

Author: Stephanie Christine Lam

systems/llnl-cluster/system.py

@@ -19,6 +19,11 @@ class LlnlCluster(System):
             "sys_cores_per_node": 56,
             "sys_cores_os_reserved_per_node": 0,  # No core or thread reservation
             "sys_cores_os_reserved_per_node_list": None,
+            "sys_mem_per_node": 94, #either 94GB or ~94981-96752MB
+            "sys_cpu_mem_per_node": 94,
+            "sys_cpu_L1_size": 32, #32KB for L1d and 32KB for L1i
+            "sys_cpu_L2_size": 1024,
+            "sys_cpu_L3_size": 39, #105MB
             "sys_sockets_per_node": 2,
             "system_site": "llnl",
             "hardware_key": str(hardware_descriptions)
@@ -35,6 +40,11 @@ class LlnlCluster(System):
             "sys_cores_os_reserved_per_node": 0,  # No explicit core reservation, first thread on each core reserved (2 threads per core)
             "sys_sockets_per_node": 2,
             "sys_cores_os_reserved_per_node_list": None,
+            "sys_mem_per_node": 31, #either 31GB or ~32248MB
+            "sys_cpu_mem_per_node": 31,
+            "sys_cpu_L1_size": 48, #48KB for L1d and 32KB for L1i
+            "sys_cpu_L2_size": 2048,
+            "sys_cpu_L3_size": 105, #105MB
             "system_site": "llnl",
             "hardware_key": str(hardware_descriptions)
             + "/DELL-sapphirerapids-OmniPath/hardware_description.yaml",

systems/llnl-elcapitan/system.py

@@ -23,6 +23,15 @@ class LlnlElcapitan(System):
             "sys_cores_os_reserved_per_node_list": [0, 8, 16, 24, 32, 40, 48, 56],
             "sys_sockets_per_node": 2,
             "sys_gpus_per_node": 8,
+            "sys_mem_per_node": 125, #either 125GB or ~128997MB
+            "sys_cpu_mem_per_node": 125,
+            "sys_gpu_mem_per_node": 68702699520, #in B
+            "sys_cpu_L1_size": 32, #32KB for L1d and 32KB for L1i
+            "sys_gpu_L1_size": 16,
+            "sys_gpu_num_L1": 1008,
+            "sys_cpu_L2_size": 512, #512 KB
+            "sys_gpu_L2_size": 8192,
+            "sys_cpu_L3_size": 32, #32MB
             "system_site": "llnl",
             "scheduler": "flux",
             "hardware_key": str(hardware_descriptions)
@@ -48,6 +57,17 @@ class LlnlElcapitan(System):
             ],  # 3 cores reserved per socket
             "sys_gpus_per_node": None,  # Determined by "gpumode" variant
             "sys_sockets_per_node": 4,
+            "sys_mem_per_node": 1024, #either 125GB or ~128997MB
+            "sys_cpu_mem_per_node": 1024,
+            "sys_gpu_mem_per_node": 137438953472, #in B
+            "sys_cpu_L1_size": 32, #32KB for L1d and 32KB for L1i
+            "sys_gpu_L1_size": 32,
+            "sys_gpu_num_L1": 1104,
+            "sys_cpu_L2_size": 1024, #512 KB
+            "sys_gpu_L2_size": 4096,
+            "sys_cpu_L3_size": 32, #32MB
+            "sys_gpu_L3_size": 262144, #262144KB
+            "sys_gpu_num_L3": 4,
             "system_site": "llnl",
             "scheduler": "flux",
             "hardware_key": str(hardware_descriptions)

systems/llnl-sierra/system.py

@@ -27,6 +27,15 @@ class LlnlSierra(System):
             ],  # First two cores on each socket reserved.
             "sys_sockets_per_node": 2,
             "sys_gpus_per_node": 4,
+            "sys_mem_per_node": 256, #either 256GB or ~128997MB
+            "sys_cpu_mem_per_node": 256,
+            "sys_gpu_mem_per_node": 16384, #in MiB Fb Memory?
+            "sys_cpu_L1_size": 32, #32KB for L1d and 32KB for L1i
+            "sys_gpu_L1_size": 16, #not done
+            "sys_gpu_num_L1": 1008, #not done
+            "sys_cpu_L2_size": 512, #512 KB
+            "sys_gpu_L2_size": 8192, #not done
+            "sys_cpu_L3_size": 10, #10MB
             "system_site": "llnl",
             "hardware_key": str(hardware_descriptions)
             + "/IBM-power9-V100-Infiniband/hardware_description.yaml",