Fix benchmark test and remove from standard test suite.

Author: lriggs

cpp/src/gandiva/precompiled/CMakeLists.txt

@@ -85,18 +85,28 @@ add_gandiva_test(precompiled-test
                  ARROW_STATIC
                  GANDIVA_STATIC)
 
-# microbenchmark (built as a gandiva test so it links the precompiled sources
-# directly; run on demand via the gandiva-precompiled-benchmark binary)
-add_gandiva_test(precompiled-benchmark
-                 SOURCES
-                 ../context_helper.cc
-                 string_ops_benchmark.cc
-                 string_ops.cc
-                 EXTRA_INCLUDES
-                 ${CMAKE_SOURCE_DIR}/src
-                 EXTRA_LINK_LIBS
-                 Boost::headers
-                 DEFINITIONS
-                 GANDIVA_UNIT_TEST=1
-                 ARROW_STATIC
-                 GANDIVA_STATIC)
+# REPLACE microbenchmark. Built on demand only -- it is a plain executable, NOT
+# registered as a ctest test, so it never runs in check-in/ctest runs. Build and
+# run it explicitly via the gandiva-precompiled-benchmark binary. It compiles the
+# precompiled sources locally (with GANDIVA_UNIT_TEST=1) so the functions are
+# directly callable, mirroring how the precompiled-test target links.
+if(ARROW_BUILD_TESTS)
+  if(ARROW_TEST_LINKAGE STREQUAL "static")
+    set(GANDIVA_BENCHMARK_LINK_LIBS ${GANDIVA_STATIC_TEST_LINK_LIBS})
+  else()
+    set(GANDIVA_BENCHMARK_LINK_LIBS ${GANDIVA_SHARED_TEST_LINK_LIBS})
+  endif()
+  add_executable(gandiva-precompiled-benchmark string_ops_benchmark.cc string_ops.cc
+                                               ../context_helper.cc)
+  target_link_libraries(gandiva-precompiled-benchmark
+                        PRIVATE ${ARROW_GTEST_GTEST_HEADERS}
+                                ${GANDIVA_BENCHMARK_LINK_LIBS} Boost::headers)
+  target_include_directories(gandiva-precompiled-benchmark SYSTEM
+                             PUBLIC ${CMAKE_SOURCE_DIR}/src)
+  target_compile_definitions(gandiva-precompiled-benchmark
+                             PRIVATE GANDIVA_UNIT_TEST=1 ARROW_STATIC GANDIVA_STATIC)
+  if(ARROW_TEST_LINKAGE STREQUAL "static")
+    # libLLVM*.a needs the executable to export the ORC EH-frame wrappers.
+    set_target_properties(gandiva-precompiled-benchmark PROPERTIES ENABLE_EXPORTS TRUE)
+  endif()
+endif()

cpp/src/gandiva/precompiled/string_ops_benchmark.cc

@@ -141,11 +141,18 @@ TEST(StringOpsBenchmark, Replace) {
       ctx.Reset();
     };
 
-    // Warm up (and verify both produce the same length / no error).
-    run_new();
-    ASSERT_FALSE(ctx.has_error());
-    run_old();
-    ASSERT_FALSE(ctx.has_error());
+    // Warm up and verify correctness. Check has_error()/out_len BEFORE Reset(),
+    // since Reset() clears the error and the timed lambdas reset internally.
+    int32_t new_len = 0;
+    replace_utf8_utf8_utf8(ctx_ptr, tp, tlen, fp, flen, op, olen, &new_len);
+    ASSERT_FALSE(ctx.has_error()) << c.name << ": " << ctx.get_error();
+    ctx.Reset();
+    int32_t old_len = 0;
+    replace_with_max_len_utf8_utf8_utf8(ctx_ptr, tp, tlen, fp, flen, op, olen,
+                                        out_capacity, &old_len);
+    ASSERT_FALSE(ctx.has_error()) << c.name << ": " << ctx.get_error();
+    ctx.Reset();
+    ASSERT_EQ(new_len, old_len) << c.name << ": new/old output lengths differ";
 
     double new_ns = TimeNsPerCall(run_new, c.iters);
     double old_ns = TimeNsPerCall(run_old, c.iters);