diff --git a/lib/refrepo/gen/wiki/generators/hardware.rb b/lib/refrepo/gen/wiki/generators/hardware.rb index fef08119c52319e070c222f5a8ef3d62effa1937..628ebe887272c6a8d4e4120ce9b4dd8f0e170836 100644 --- a/lib/refrepo/gen/wiki/generators/hardware.rb +++ b/lib/refrepo/gen/wiki/generators/hardware.rb @@ -364,7 +364,6 @@ class G5KHardwareGenerator < WikiGenerator 'Haswell' => '2013', 'POWER8' => '2014', 'Broadwell' => '2015', - 'Skylake' => '2015', 'Skylake-SP' => '2017', 'Zen' => '2017', 'Zen 2' => '2019', @@ -373,7 +372,6 @@ class G5KHardwareGenerator < WikiGenerator 'Zen 4c' => '2022', 'Cascade Lake-SP' => '2019', 'Vulcan' => '2018', - #'Ice Lake' => '2019', # Note there are no client Ice Lake CPU in Grid5K 'Ice Lake-SP' => '2021', 'Carmel' => '2018', 'Vega20' => '2018', diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb index 463a11655ce1dba20eeaaca2b19fdafeaaa5f364..b93350b45e13f465b0306d816182e6ffc505b3f8 100644 --- a/lib/refrepo/input_loader.rb +++ b/lib/refrepo/input_loader.rb @@ -736,11 +736,11 @@ def get_flops_per_cycle(microarch, cpu_name, cluster_uid) return 8 when "Haswell", "Broadwell", "Zen 2", "Zen 3" return 16 - when "Ice Lake", "Ice Lake-SP" + when "Ice Lake-SP" return 32 when "Zen 4", "Zen 4c" return 48 - when "Cascade Lake-SP", "Skylake", "Skylake-SP" + when "Cascade Lake-SP", "Skylake-SP" case cpu_name when /Silver 4110/, /Silver 4114/, /Silver 4214/, /Gold 5218/, /Gold 5220/, /Gold 5115/, /Gold 5118/, /Gold 5120/, /Gold 5220R/ return 16