aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duncan <pabs@pablotron.org>2019-07-23 02:20:29 -0400
committerPaul Duncan <pabs@pablotron.org>2019-07-23 02:20:29 -0400
commitea813011e04fccccee36899bdbf6a92d733708ef (patch)
tree8360a1e082a0a3f97943b56884ec720c5724316f
parent654647ab7ed7daaf6887c9b93af11a74eeeeab1c (diff)
downloadpi4-bench-master.tar.bz2
pi4-bench-master.zip
remove unused "arch" directive in config (now pulled from lscpu), and replace "pi" with "set" directiveHEADmaster
-rw-r--r--config.yaml29
-rwxr-xr-xrun.rb4
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|