remove unused "arch" directive in config (now pulled from lscpu), and replace "pi" with "set" directiveHEADmaster

2 files changed, 13 insertions, 20 deletions

diff --git a/config.yaml b/config.yaml
index d0c0ed8..6c38d69 100644
--- a/config.yaml
+++ b/config.yaml
@@ -14,44 +14,37 @@ hosts:
   - name: "pi0w-zero"
     host: "zero"
     text: "Raspberry Pi Zero W"
-    arch: "armv6l"
-    pi:   true
+    set:  "arm"
 
   - name: "pi3b-pecan"
     host: "pecan"
     text: "Raspberry Pi 3 Model B"
-    arch: "armv7l"
-    pi:   true
+    set:  "arm"
 
   - name: "pi3b+-peach"
     host: "peach"
     text: "Raspberry Pi 3 Model B+"
-    arch: "armv7l"
-    pi:   true
+    set:  "arm"
 
   - name: "pi4b-cherry"
     host: "cherry"
     text: "Raspberry Pi 4 Model B"
-    arch: "armv7l"
-    pi:   true
-
-  - name: "i78650u-flex"
-    host: "flex"
-    text: "Intel i7-8650U (Lenovo X1 Carbon, 6th Gen)"
-    arch: "amd64"
-    pi:   false
+    set:  "arm"
 
   - name: "linode"
     host: "pmdn.org"
     text: "Linode VM (1 Core)"
-    arch: "amd64"
-    pi:   false
+    set:  "x86"
+
+  - name: "i78650u-flex"
+    host: "flex"
+    text: "Intel i7-8650U (Lenovo X1 Carbon, 6th Gen)"
+    set:  "x86"
 
   - name: "tr1950x-v4"
     host: "v4.wg"
     text: "AMD Ryzen Threadripper 1950X"
-    arch: "amd64"
-    pi:   false
+    set:  "x86"
 
 # list of algorithms to test (optional)
 # algos:
diff --git a/run.rb b/run.rb
index c0d8457..d231e45 100755
--- a/run.rb
+++ b/run.rb
@@ -615,8 +615,8 @@ module PiBench
 
             # parse speed files
             Dir[glob].each do |path|
-              # get arch
-              arch = row['pi'] ? 'arm' : 'x86'
+              # get arch set (e.g. "arm" or "x86")
+              arch = row['set']
 
               # parse file
               File.readlines(path).select { |line|