From a5106e193dd4f2d7e701f023eb6ac0bf6f715b92 Mon Sep 17 00:00:00 2001
From: Patrice RINGOT <patrice.ringot@loria.fr>
Date: Tue, 21 Mar 2023 11:48:33 +0100
Subject: [PATCH] [Nancy][grat] zen2 -> zen3
---
data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json | 2 +-
input/grid5000/sites/nancy/clusters/grat/grat.yaml | 2 +-
lib/refrepo/gen/wiki/generators/hardware.rb | 1 +
lib/refrepo/input_loader.rb | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json b/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json
index aa349d6112a..bfce356b636 100644
--- a/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json
+++ b/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json
@@ -309,7 +309,7 @@
"clock_speed": 2100000000,
"ht_capable": true,
"instruction_set": "x86-64",
- "microarchitecture": "Zen 2",
+ "microarchitecture": "Zen 3",
"microcode": "0xa001173",
"model": "AMD EPYC",
"other_description": "AMD EPYC 7513 32-Core Processor",
diff --git a/input/grid5000/sites/nancy/clusters/grat/grat.yaml b/input/grid5000/sites/nancy/clusters/grat/grat.yaml
index 5a2ff8933a9..990d2f51bc4 100644
--- a/input/grid5000/sites/nancy/clusters/grat/grat.yaml
+++ b/input/grid5000/sites/nancy/clusters/grat/grat.yaml
@@ -13,7 +13,7 @@ nodes:
besteffort: true
max_walltime: 0
processor:
- microarchitecture: Zen 2
+ microarchitecture: Zen 3
clock_speed: 2100000000
software:
standard-environment: debian11-x64-std
diff --git a/lib/refrepo/gen/wiki/generators/hardware.rb b/lib/refrepo/gen/wiki/generators/hardware.rb
index c2981f53452..5f7c790cde6 100644
--- a/lib/refrepo/gen/wiki/generators/hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/hardware.rb
@@ -354,6 +354,7 @@ class G5KHardwareGenerator < WikiGenerator
'Skylake' => '2016',
'Zen' => '2017',
'Zen 2' => '2019',
+ 'Zen 3' => '2020',
'Cascade Lake-SP' => '2019',
'Vulcan' => '2018',
'Ice Lake' => '2021',
diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb
index e9ff1d30ba2..ade63f9756f 100644
--- a/lib/refrepo/input_loader.rb
+++ b/lib/refrepo/input_loader.rb
@@ -682,7 +682,7 @@ def get_flops_per_cycle(microarch, cpu_name)
return 4
when "Sandy Bridge", "Zen", "Vulcan"
return 8
- when "Haswell", "Broadwell", "Zen 2"
+ when "Haswell", "Broadwell", "Zen 2", "Zen 3"
return 16
when "Ice Lake"
return 32
--
GitLab