From ed80d6f26d3dfc8d473277c90837cd9f48860086 Mon Sep 17 00:00:00 2001 From: Sharjeel Khan Date: Fri, 25 Sep 2026 11:42:46 -0700 Subject: [PATCH 1/2] Raise the vectorization #if to NDK r32 Vectorization will still not be available in r31 --- vectorization/src/main/cpp/benchmark.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vectorization/src/main/cpp/benchmark.cpp b/vectorization/src/main/cpp/benchmark.cpp index 770a03219..d09ae42c1 100644 --- a/vectorization/src/main/cpp/benchmark.cpp +++ b/vectorization/src/main/cpp/benchmark.cpp @@ -86,7 +86,7 @@ BenchmarkMatrixMultiplication(Backend backend) { return MultiplyWithAutoVectorization(t, p); }); case Backend::kCxxSimd: -#if __NDK_MAJOR__ >= 31 +#if __NDK_MAJOR__ >= 32 #error check if std::simd works yet #endif // The libc++ in NDK r27 has only a skeleton implementation of std::simd. From 6ccaf40eac59577ae322111822fa0dc4a0341ec7 Mon Sep 17 00:00:00 2001 From: Sharjeel Khan Date: Fri, 25 Sep 2026 11:58:02 -0700 Subject: [PATCH 2/2] Update r27 reference to r31 --- vectorization/src/main/cpp/benchmark.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vectorization/src/main/cpp/benchmark.cpp b/vectorization/src/main/cpp/benchmark.cpp index d09ae42c1..9c9d4f186 100644 --- a/vectorization/src/main/cpp/benchmark.cpp +++ b/vectorization/src/main/cpp/benchmark.cpp @@ -89,7 +89,7 @@ BenchmarkMatrixMultiplication(Backend backend) { #if __NDK_MAJOR__ >= 32 #error check if std::simd works yet #endif - // The libc++ in NDK r27 has only a skeleton implementation of std::simd. + // The libc++ in NDK r31 has only a skeleton implementation of std::simd. // Some things we can do without, but it doesn't actually have operator*, // which is sort of essential :) LOG(INFO) << "Benchmarking std::simd";