From de8389d1e97a9b23b53fcabb8ac9aed0e4ee17f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 16 May 2019 08:58:42 +0200 Subject: [PATCH 1/8] write line separator to output properly formatted jsonlines --- dev/archery/archery/cli.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev/archery/archery/cli.py b/dev/archery/archery/cli.py index b7b077ab87c..0178d58a03f 100644 --- a/dev/archery/archery/cli.py +++ b/dev/archery/archery/cli.py @@ -352,9 +352,12 @@ def benchmark_diff(ctx, src, preserve, suite_filter, benchmark_filter, regressions = 0 runner_comp = RunnerComparator(runner_cont, runner_base, threshold) + + # TODO(kszucs): test that the output is properly formatted jsonlines for comparator in runner_comp.comparisons: regressions += comparator.regression json.dump(comparator, output, cls=JsonEncoder) + output.write('\n') sys.exit(regressions) From 35f64689a3e89765bacc2aa1875959a7402b20f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 16 May 2019 09:18:54 +0200 Subject: [PATCH 2/8] arm intrinsics --- cpp/src/arrow/compute/kernels/aggregate-benchmark.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cpp/src/arrow/compute/kernels/aggregate-benchmark.cc b/cpp/src/arrow/compute/kernels/aggregate-benchmark.cc index bbc923f6ebd..0b7c6cff4d4 100644 --- a/cpp/src/arrow/compute/kernels/aggregate-benchmark.cc +++ b/cpp/src/arrow/compute/kernels/aggregate-benchmark.cc @@ -18,10 +18,15 @@ #include "benchmark/benchmark.h" #include + #ifdef _MSC_VER -#include + #include +#elif defined(__GNUC__) && defined(__ARM_NEON__) + #include +#elif defined(__GNUC__) && defined(__IWMMXT__) + #include #else -#include + #include #endif #include "arrow/builder.h" From f1f4f9203506cb104075f03dcb6856abe73dfa51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 16 May 2019 09:41:23 +0200 Subject: [PATCH 3/8] remove intrinsics include --- cpp/src/arrow/compute/kernels/aggregate-benchmark.cc | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cpp/src/arrow/compute/kernels/aggregate-benchmark.cc b/cpp/src/arrow/compute/kernels/aggregate-benchmark.cc index 0b7c6cff4d4..0851c9812aa 100644 --- a/cpp/src/arrow/compute/kernels/aggregate-benchmark.cc +++ b/cpp/src/arrow/compute/kernels/aggregate-benchmark.cc @@ -19,22 +19,11 @@ #include -#ifdef _MSC_VER - #include -#elif defined(__GNUC__) && defined(__ARM_NEON__) - #include -#elif defined(__GNUC__) && defined(__IWMMXT__) - #include -#else - #include -#endif - #include "arrow/builder.h" #include "arrow/memory_pool.h" #include "arrow/testing/gtest_util.h" #include "arrow/testing/random.h" #include "arrow/util/bit-util.h" - #include "arrow/compute/benchmark-util.h" #include "arrow/compute/context.h" #include "arrow/compute/kernel.h" From 29bded608d48b2cfe0996b9294d262979a919282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 16 May 2019 16:46:30 +0200 Subject: [PATCH 4/8] clang format --- cpp/src/arrow/compute/kernels/aggregate-benchmark.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/src/arrow/compute/kernels/aggregate-benchmark.cc b/cpp/src/arrow/compute/kernels/aggregate-benchmark.cc index 0851c9812aa..085843e700d 100644 --- a/cpp/src/arrow/compute/kernels/aggregate-benchmark.cc +++ b/cpp/src/arrow/compute/kernels/aggregate-benchmark.cc @@ -20,14 +20,14 @@ #include #include "arrow/builder.h" -#include "arrow/memory_pool.h" -#include "arrow/testing/gtest_util.h" -#include "arrow/testing/random.h" -#include "arrow/util/bit-util.h" #include "arrow/compute/benchmark-util.h" #include "arrow/compute/context.h" #include "arrow/compute/kernel.h" #include "arrow/compute/kernels/sum.h" +#include "arrow/memory_pool.h" +#include "arrow/testing/gtest_util.h" +#include "arrow/testing/random.h" +#include "arrow/util/bit-util.h" namespace arrow { namespace compute { From 55d2c77f14f89e4b74600c3a7b3620ccc8f609d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 16 May 2019 18:53:27 +0200 Subject: [PATCH 5/8] intrinsics --- cpp/src/arrow/io/memory-benchmark.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cpp/src/arrow/io/memory-benchmark.cc b/cpp/src/arrow/io/memory-benchmark.cc index 78389574b63..1e79376bad1 100644 --- a/cpp/src/arrow/io/memory-benchmark.cc +++ b/cpp/src/arrow/io/memory-benchmark.cc @@ -16,9 +16,13 @@ // under the License. #ifdef _MSC_VER -#include + #include +#elif defined(__GNUC__) && defined(__ARM_NEON__) + #include +#elif defined(__GNUC__) && defined(__IWMMXT__) + #include #else -#include + #include #endif #include From 20e485000cefcdd75f321ff721b8c1b7fe9ec05c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Sun, 19 May 2019 12:43:42 +0200 Subject: [PATCH 6/8] clang-format --- cpp/src/arrow/io/memory-benchmark.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/src/arrow/io/memory-benchmark.cc b/cpp/src/arrow/io/memory-benchmark.cc index 1e79376bad1..ed59833abfc 100644 --- a/cpp/src/arrow/io/memory-benchmark.cc +++ b/cpp/src/arrow/io/memory-benchmark.cc @@ -16,13 +16,13 @@ // under the License. #ifdef _MSC_VER - #include +#include #elif defined(__GNUC__) && defined(__ARM_NEON__) - #include +#include #elif defined(__GNUC__) && defined(__IWMMXT__) - #include +#include #else - #include +#include #endif #include From 3c8deb1840f33e8fbe9a4f7dd960a68306e8adc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Sun, 19 May 2019 14:39:35 +0200 Subject: [PATCH 7/8] __ARM_NEON__ is legacy --- cpp/src/arrow/io/memory-benchmark.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/src/arrow/io/memory-benchmark.cc b/cpp/src/arrow/io/memory-benchmark.cc index ed59833abfc..9303975455d 100644 --- a/cpp/src/arrow/io/memory-benchmark.cc +++ b/cpp/src/arrow/io/memory-benchmark.cc @@ -17,7 +17,7 @@ #ifdef _MSC_VER #include -#elif defined(__GNUC__) && defined(__ARM_NEON__) +#elif defined(__GNUC__) && defined(__ARM_NEON) #include #elif defined(__GNUC__) && defined(__IWMMXT__) #include From 2be8098922c9d82adee168c3c56ec6e24ee110f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Tue, 21 May 2019 10:33:11 +0200 Subject: [PATCH 8/8] remove arm intrinsics headers --- cpp/src/arrow/io/memory-benchmark.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cpp/src/arrow/io/memory-benchmark.cc b/cpp/src/arrow/io/memory-benchmark.cc index 9303975455d..78389574b63 100644 --- a/cpp/src/arrow/io/memory-benchmark.cc +++ b/cpp/src/arrow/io/memory-benchmark.cc @@ -17,10 +17,6 @@ #ifdef _MSC_VER #include -#elif defined(__GNUC__) && defined(__ARM_NEON) -#include -#elif defined(__GNUC__) && defined(__IWMMXT__) -#include #else #include #endif