diff --git a/benchmark/hardware.sh b/benchmark/hardware.sh
index 69e05cf804b..15cae4e795b 100755
--- a/benchmark/hardware.sh
+++ b/benchmark/hardware.sh
@@ -11,10 +11,6 @@ DATASET="${TABLE}_v1.tar.xz"
QUERIES_FILE="queries.sql"
TRIES=3
-AMD64_BIN_URL="https://builds.clickhouse.com/master/amd64/clickhouse"
-AARCH64_BIN_URL="https://builds.clickhouse.com/master/aarch64/clickhouse"
-POWERPC64_BIN_URL="https://builds.clickhouse.com/master/ppc64le/clickhouse"
-
# Note: on older Ubuntu versions, 'axel' does not support IPv6. If you are using IPv6-only servers on very old Ubuntu, just don't install 'axel'.
FASTER_DOWNLOAD=wget
@@ -33,18 +29,68 @@ fi
mkdir -p clickhouse-benchmark-$SCALE
pushd clickhouse-benchmark-$SCALE
-if [[ ! -f clickhouse ]]; then
- CPU=$(uname -m)
- if [[ ($CPU == x86_64) || ($CPU == amd64) ]]; then
- $FASTER_DOWNLOAD "$AMD64_BIN_URL"
- elif [[ $CPU == aarch64 ]]; then
- $FASTER_DOWNLOAD "$AARCH64_BIN_URL"
- elif [[ $CPU == powerpc64le ]]; then
- $FASTER_DOWNLOAD "$POWERPC64_BIN_URL"
- else
- echo "Unsupported CPU type: $CPU"
- exit 1
+#!/bin/sh -e
+
+OS=$(uname -s)
+ARCH=$(uname -m)
+
+DIR=
+
+if [ "${OS}" = "Linux" ]
+then
+ if [ "${ARCH}" = "x86_64" ]
+ then
+ DIR="amd64"
+ elif [ "${ARCH}" = "aarch64" ]
+ then
+ DIR="aarch64"
+ elif [ "${ARCH}" = "powerpc64le" ]
+ then
+ DIR="powerpc64le"
fi
+elif [ "${OS}" = "FreeBSD" ]
+then
+ if [ "${ARCH}" = "x86_64" ]
+ then
+ DIR="freebsd"
+ elif [ "${ARCH}" = "aarch64" ]
+ then
+ DIR="freebsd-aarch64"
+ elif [ "${ARCH}" = "powerpc64le" ]
+ then
+ DIR="freebsd-powerpc64le"
+ fi
+elif [ "${OS}" = "Darwin" ]
+then
+ if [ "${ARCH}" = "x86_64" ]
+ then
+ DIR="macos"
+ elif [ "${ARCH}" = "aarch64" -o "${ARCH}" = "arm64" ]
+ then
+ DIR="macos-aarch64"
+ fi
+fi
+
+if [ -z "${DIR}" ]
+then
+ echo "The '${OS}' operating system with the '${ARCH}' architecture is not supported."
+ exit 1
+fi
+
+URL="https://builds.clickhouse.com/master/${DIR}/clickhouse"
+echo
+echo "Will download ${URL}"
+echo
+curl -O "${URL}" && chmod a+x clickhouse || exit 1
+echo
+echo "Successfully downloaded the ClickHouse binary, you can run it as:
+ ./clickhouse"
+
+if [ "${OS}" = "Linux" ]
+then
+ echo
+ echo "You can also install it:
+ sudo ./clickhouse install"
fi
chmod a+x clickhouse
@@ -88,7 +134,12 @@ echo
cat "$QUERIES_FILE" | sed "s/{table}/${TABLE}/g" | while read query; do
sync
- echo 3 | sudo tee /proc/sys/vm/drop_caches >/dev/null
+ if [ "${OS}" = "Darwin" ]
+ then
+ sudo purge > /dev/null
+ else
+ echo 3 | sudo tee /proc/sys/vm/drop_caches >/dev/null
+ fi
echo -n "["
for i in $(seq 1 $TRIES); do
diff --git a/website/benchmark/hardware/index.html b/website/benchmark/hardware/index.html
index c6b1e2be275..d67fc0d9dfe 100644
--- a/website/benchmark/hardware/index.html
+++ b/website/benchmark/hardware/index.html
@@ -85,6 +85,11 @@ Results for ThinkPad P15 are from Mikhail Shiryaev.
Results for RockPi4 are from Kirill Zholnay.
Results for Xeon 6266C are from David in Shanghai.
Results for SSDNodes and Cavium are from Lorenzo QXIP.
+Results for AMD EPYC 7662 64-Core Processor are from Evgeniy Kuts.
+Results for scaleway GP1-S 8x x86 64bit 32GB ram 300gb NVMe are from Dag Vilmar Tveit.
+Results for scaleway GP1-M 16x x86 64bit 64GB ram 600gb NVMe are from Dag Vilmar Tveit.
+Results for Intel(R) Core(TM) i5-4440 CPU @ 3.10GHz are from Peter, Chun-Sheng, Li.
+Results for MacBook Pro M1 are from Filatenkov Arthur.
diff --git a/website/benchmark/hardware/results/amd_epyc_7662.json b/website/benchmark/hardware/results/amd_epyc_7662.json
new file mode 100644
index 00000000000..436c0099992
--- /dev/null
+++ b/website/benchmark/hardware/results/amd_epyc_7662.json
@@ -0,0 +1,54 @@
+[
+ {
+ "system": "AMD EPYC 7662",
+ "system_full": "AMD EPYC 7662 64-Core Processor",
+ "time": "2022-01-26 11:28:55",
+ "kind": "server",
+ "result":
+ [
+ [0.001, 0.001, 0.001],
+ [0.037, 0.019, 0.020],
+ [0.082, 0.034, 0.026],
+ [0.298, 0.045, 0.038],
+ [0.424, 0.188, 0.178],
+ [0.594, 0.229, 0.227],
+ [0.037, 0.028, 0.032],
+ [0.060, 0.028, 0.027],
+ [0.496, 0.185, 0.192],
+ [0.611, 0.210, 0.214],
+ [0.400, 0.148, 0.137],
+ [0.424, 0.155, 0.144],
+ [0.639, 0.256, 0.239],
+ [0.944, 0.404, 0.309],
+ [0.699, 0.326, 0.288],
+ [0.461, 0.221, 0.216],
+ [1.176, 0.539, 0.561],
+ [1.070, 0.410, 0.426],
+ [2.080, 0.950, 0.866],
+ [0.351, 0.066, 0.130],
+ [3.248, 0.461, 0.313],
+ [3.612, 0.261, 0.231],
+ [6.720, 0.682, 0.671],
+ [6.300, 0.517, 0.488],
+ [0.982, 0.136, 0.125],
+ [0.531, 0.112, 0.109],
+ [1.006, 0.133, 0.118],
+ [3.184, 0.324, 0.310],
+ [2.799, 0.327, 0.308],
+ [0.569, 0.492, 0.493],
+ [0.900, 0.212, 0.221],
+ [1.925, 0.353, 0.326],
+ [2.489, 1.173, 1.248],
+ [3.626, 0.990, 0.897],
+ [3.743, 0.935, 0.915],
+ [0.419, 0.311, 0.339],
+ [0.278, 0.244, 0.236],
+ [0.111, 0.099, 0.098],
+ [0.139, 0.086, 0.084],
+ [0.664, 0.520, 0.552],
+ [0.072, 0.028, 0.036],
+ [0.050, 0.031, 0.022],
+ [0.005, 0.005, 0.011]
+ ]
+ }
+]
diff --git a/website/benchmark/hardware/results/gp1_s_16x.json b/website/benchmark/hardware/results/gp1_s_16x.json
new file mode 100644
index 00000000000..1353fc87d00
--- /dev/null
+++ b/website/benchmark/hardware/results/gp1_s_16x.json
@@ -0,0 +1,54 @@
+[
+ {
+ "system": "scaleway GP1-S 8x x86",
+ "system_full": "scaleway GP1-M 16x x86 64bit 64GB ram 600gb NVMe",
+ "time": "2022-02-16 00:00:00",
+ "kind": "cloud",
+ "result":
+ [
+ [0.005, 0.005, 0.036],
+ [0.039, 0.026, 0.026],
+ [0.092, 0.046, 0.046],
+ [0.172, 0.056, 0.055],
+ [0.166, 0.126, 0.123],
+ [0.364, 0.272, 0.265],
+ [0.005, 0.006, 0.005],
+ [0.028, 0.027, 0.029],
+ [0.581, 0.49, 0.486],
+ [0.69, 0.549, 0.553],
+ [0.248, 0.178, 0.175],
+ [0.266, 0.208, 0.208],
+ [1.584, 1.017, 0.868],
+ [1.717, 1.113, 1.145],
+ [1.144, 1.084, 1.048],
+ [0.991, 0.92, 0.895],
+ [4.121, 2.639, 2.621],
+ [1.447, 1.348, 1.354],
+ [6.802, 6.466, 6.433],
+ [0.142, 0.057, 0.052],
+ [1.252, 0.743, 0.715],
+ [1.389, 0.823, 0.791],
+ [3.143, 2.225, 2.159],
+ [1.795, 0.871, 0.837],
+ [0.361, 0.236, 0.229],
+ [0.264, 0.211, 0.214],
+ [0.37, 0.24, 0.225],
+ [1.449, 0.967, 0.876],
+ [1.605, 1.206, 1.16 ],
+ [3.412, 3.388, 3.397],
+ [0.783, 0.628, 0.65 ],
+ [1.419, 1.134, 1.112],
+ [6.983, 6.843, 6.852],
+ [5.466, 5.082, 4.955],
+ [5.632, 4.972, 5.22 ],
+ [1.639, 1.604, 1.571],
+ [0.285, 0.298, 0.269],
+ [0.115, 0.115, 0.101],
+ [0.098, 0.1, 0.092],
+ [0.563, 0.562, 0.512],
+ [0.058, 0.039, 0.042],
+ [0.039, 0.039, 0.025],
+ [0.029, 0.012, 0.012]
+ ]
+ }
+]
diff --git a/website/benchmark/hardware/results/gp1_s_8x.json b/website/benchmark/hardware/results/gp1_s_8x.json
new file mode 100644
index 00000000000..2bc008af54c
--- /dev/null
+++ b/website/benchmark/hardware/results/gp1_s_8x.json
@@ -0,0 +1,54 @@
+[
+ {
+ "system": "scaleway GP1-S 8x x86",
+ "system_full": "scaleway GP1-S 8x x86 64bit 32GB ram 300gb NVMe",
+ "time": "2022-02-16 00:00:00",
+ "kind": "cloud",
+ "result":
+ [
+ [0.026, 0.004, 0.004],
+ [0.038, 0.026, 0.026],
+ [0.071, 0.058, 0.059],
+ [0.118, 0.072, 0.069],
+ [0.190, 0.151, 0.155],
+ [0.465, 0.438, 0.401],
+ [0.002, 0.004, 0.004],
+ [0.028, 0.029, 0.026],
+ [0.751, 0.672, 0.676],
+ [0.897, 0.845, 0.798],
+ [0.291, 0.234, 0.254],
+ [0.371, 0.297, 0.296],
+ [1.208, 1.041, 1.005],
+ [1.445, 1.400, 1.414],
+ [1.406, 1.317, 1.342],
+ [1.414, 1.242, 1.244],
+ [4.179, 3.849, 3.878],
+ [2.320, 2.275, 2.201],
+ [7.499, 7.424, 7.196],
+ [0.135, 0.077, 0.068],
+ [1.465, 1.075, 1.063],
+ [1.700, 1.221, 1.198],
+ [3.731, 2.959, 2.905],
+ [2.283, 1.401, 1.342],
+ [0.474, 0.377, 0.367],
+ [0.371, 0.314, 0.337],
+ [0.483, 0.357, 0.356],
+ [1.565, 1.194, 1.181],
+ [2.226, 1.815, 1.746],
+ [2.990, 2.971, 2.947],
+ [1.003, 0.815, 0.842],
+ [1.386, 1.127, 1.108],
+ [8.174, 7.690, 7.735],
+ [6.171, 5.802, 5.933],
+ [6.201, 5.774, 5.972],
+ [1.758, 1.642, 1.639],
+ [0.288, 0.273, 0.253],
+ [0.121, 0.125, 0.107],
+ [0.096, 0.082, 0.088],
+ [0.490, 0.461, 0.476],
+ [0.041, 0.037, 0.035],
+ [0.035, 0.031, 0.025],
+ [0.008, 0.011, 0.015]
+ ]
+ }
+]
diff --git a/website/benchmark/hardware/results/intel_core_i5_4440.json b/website/benchmark/hardware/results/intel_core_i5_4440.json
new file mode 100644
index 00000000000..b70b9e08fd4
--- /dev/null
+++ b/website/benchmark/hardware/results/intel_core_i5_4440.json
@@ -0,0 +1,54 @@
+[
+ {
+ "system": "Intel(R) Core(TM) i5-4440 CPU @ 3.10GHz",
+ "system_full": "Intel(R) Core(TM) i5-4440 CPU @ 3.10GHz",
+ "time": "2022-01-06 08:48:45",
+ "kind": "server",
+ "result":
+ [
+ [0.002, 0.001, 0.001],
+ [0.136, 0.021, 0.020],
+ [1.102, 0.061, 0.055],
+ [2.669, 0.089, 0.084],
+ [2.646, 0.198, 0.192],
+ [4.018, 0.606, 0.600],
+ [0.115, 0.034, 0.044],
+ [0.210, 0.018, 0.018],
+ [4.655, 1.002, 1.004],
+ [6.715, 1.139, 1.150],
+ [3.235, 0.351, 0.352],
+ [3.850, 0.410, 0.408],
+ [4.446, 1.579, 1.570],
+ [7.112, 2.031, 2.061],
+ [5.658, 1.812, 1.804],
+ [3.528, 1.600, 1.599],
+ [9.216, 5.029, 5.031],
+ [7.023, 2.968, 3.362],
+ [17.412, 9.705, 9.695],
+ [2.717, 0.110, 0.100],
+ [28.586, 1.907, 1.870],
+ [34.064, 2.178, 2.172],
+ [67.172, 5.105, 5.101],
+ [79.885, 2.579, 2.540],
+ [9.176, 0.572, 0.560],
+ [4.050, 0.496, 0.492],
+ [8.918, 0.575, 0.568],
+ [28.731, 2.089, 2.058],
+ [24.174, 2.956, 3.043],
+ [5.103, 5.010, 5.007],
+ [10.075, 1.188, 1.197],
+ [18.485, 1.966, 1.954],
+ [19.455, 10.855, 10.917],
+ [31.320, 7.848, 7.831],
+ [30.794, 7.871, 7.877],
+ [3.360, 2.777, 2.778],
+ [0.371, 0.166, 0.180],
+ [0.259, 0.064, 0.083],
+ [0.275, 0.060, 0.058],
+ [1.024, 0.380, 0.378],
+ [0.198, 0.025, 0.025],
+ [0.162, 0.023, 0.015],
+ [0.059, 0.006, 0.007]
+ ]
+ }
+]
diff --git a/website/benchmark/hardware/results/macbook_pro_m1_2021.json b/website/benchmark/hardware/results/macbook_pro_m1_2021.json
new file mode 100644
index 00000000000..516940e1ef2
--- /dev/null
+++ b/website/benchmark/hardware/results/macbook_pro_m1_2021.json
@@ -0,0 +1,54 @@
+[
+ {
+ "system": "MacBook Pro M1",
+ "system_full": "MacBook Pro M1 Max 16\" 2022, 64 GiB RAM, 1 TB SSD",
+ "time": "2022-02-27 00:00:00",
+ "kind": "laptop",
+ "result":
+ [
+ [0.012, 0.001, 0.001],
+ [0.096, 0.012, 0.010],
+ [0.043, 0.022, 0.023],
+ [0.063, 0.031, 0.030],
+ [0.099, 0.070, 0.070],
+ [0.229, 0.197, 0.195],
+ [0.012, 0.001, 0.001],
+ [0.027, 0.012, 0.011],
+ [0.340, 0.301, 0.306],
+ [0.439, 0.383, 0.386],
+ [0.169, 0.134, 0.136],
+ [0.197, 0.160, 0.162],
+ [0.475, 0.435, 0.432],
+ [0.615, 0.557, 0.553],
+ [0.553, 0.502, 0.507],
+ [0.490, 0.445, 0.439],
+ [1.392, 1.260, 1.254],
+ [0.865, 0.833, 0.835],
+ [2.285, 2.180, 2.194],
+ [0.064, 0.035, 0.033],
+ [0.761, 0.650, 0.651],
+ [0.867, 0.715, 0.718],
+ [1.753, 1.478, 1.499],
+ [1.037, 0.737, 0.735],
+ [0.251, 0.201, 0.202],
+ [0.208, 0.172, 0.174],
+ [0.254, 0.202, 0.201],
+ [0.733, 0.598, 0.603],
+ [0.995, 0.882, 0.879],
+ [0.562, 0.545, 0.545],
+ [0.431, 0.371, 0.371],
+ [0.586, 0.490, 0.490],
+ [2.882, 2.664, 2.656],
+ [2.255, 2.147, 2.146],
+ [2.248, 2.137, 2.154],
+ [0.659, 0.638, 0.631],
+ [0.125, 0.108, 0.108],
+ [0.070, 0.052, 0.052],
+ [0.060, 0.042, 0.042],
+ [0.250, 0.229, 0.228],
+ [0.030, 0.013, 0.012],
+ [0.026, 0.011, 0.010],
+ [0.017, 0.003, 0.003]
+ ]
+ }
+]