Decouple the building of benchmarks and tests (#491)

Summary:
X-link: pytorch/torcharrow#491

Tests and benchmarks targets are now de-coupled.
That means they can be built independently.
Shared functionality is moved to a common utility library.

Resolves #1704

Pull Request resolved: #2439

Reviewed By: Yuhta

Differential Revision: D39484543

Pulled By: kgpai

fbshipit-source-id: 5ac888c81a6bbfbc5a1a1c4cfd41fa2c86199bc4

Author: leoluan2009

CMakeLists.txt

@@ -91,6 +91,7 @@ endif()
 if(${VELOX_ENABLE_BENCHMARKS} OR ${VELOX_ENABLE_BENCHMARKS_BASIC})
   set(VELOX_ENABLE_DUCKDB ON)
   set(VELOX_ENABLE_PARSE ON)
+  set(VELOX_BUILD_TEST_UTILS ON)
 endif()
 
 if(VELOX_ENABLE_S3)
@@ -313,12 +314,8 @@ if(VELOX_BUILD_TESTING AND NOT VELOX_ENABLE_DUCKDB)
   )
 endif()
 
-# Benchmarks and tests at some places are coupled which is not great. See
-# velox/vector/CMakeLists.txt. TODO: Decouple.
 set(VELOX_DISABLE_GOOGLETEST OFF)
-if(NOT VELOX_BUILD_TEST_UTILS
-   AND NOT VELOX_BUILD_TESTING
-   AND NOT VELOX_ENABLE_BENCHMARKS_BASIC)
+if(NOT VELOX_BUILD_TEST_UTILS AND NOT VELOX_BUILD_TESTING)
   set(VELOX_DISABLE_GOOGLETEST ON)
   add_definitions(-DVELOX_DISABLE_GOOGLETEST)
 endif()

velox/benchmarks/CMakeLists.txt

@@ -11,8 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 add_subdirectory(basic)
+
 if(${VELOX_ENABLE_BENCHMARKS})
   add_subdirectory(tpch)
 endif()

velox/benchmarks/basic/Preproc.cpp

@@ -22,7 +22,7 @@
 #include "velox/functions/lib/benchmarks/FunctionBenchmarkBase.h"
 #include "velox/functions/prestosql/Comparisons.h"
 #include "velox/functions/prestosql/registration/RegistrationFunctions.h"
-#include "velox/vector/tests/VectorTestBase.h"
+#include "velox/vector/tests/utils/VectorTestBase.h"
 
 using namespace facebook::velox;
 using namespace facebook::velox::exec;

velox/benchmarks/tpch/CMakeLists.txt

@@ -18,7 +18,7 @@ target_link_libraries(
   velox_tpch_benchmark
   velox_aggregates
   velox_exec
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_dwio_common
   velox_dwio_common_exception
   velox_dwio_parquet_reader

velox/common/file/benchmark/CMakeLists.txt

@@ -15,7 +15,7 @@
 add_library(velox_read_benchmark_lib ReadBenchmark.cpp)
 
 target_link_libraries(velox_read_benchmark_lib velox_file velox_exception
-                      velox_exec_test_util ${FMT} ${FOLLY_WITH_DEPENDENCIES})
+                      velox_exec_test_lib ${FMT} ${FOLLY_WITH_DEPENDENCIES})
 
 add_executable(velox_read_benchmark ReadBenchmarkMain.cpp)
 

velox/common/file/tests/CMakeLists.txt

@@ -18,7 +18,7 @@ target_link_libraries(
   velox_file_test
   velox_file
   velox_exception
-  velox_exec_test_util
+  velox_exec_test_lib
   ${FMT}
   ${FOLLY_WITH_DEPENDENCIES}
   gtest

velox/connectors/hive/CMakeLists.txt

@@ -25,5 +25,8 @@ add_subdirectory(storage_adapters)
 
 if(${VELOX_BUILD_TESTING})
   add_subdirectory(tests)
+endif()
+
+if(${VELOX_ENABLE_BENCHMARKS})
   add_subdirectory(benchmarks)
 endif()

velox/connectors/hive/benchmarks/CMakeLists.txt

@@ -25,7 +25,7 @@ target_link_libraries(
   velox_parse_utils
   velox_parse_expression
   velox_exec
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_hive_connector
   velox_hive_partition_function
   velox_memory

velox/connectors/hive/benchmarks/HivePartitionFunctionBenchmark.cpp

@@ -20,7 +20,7 @@
 #include "velox/type/Type.h"
 #include "velox/vector/ComplexVector.h"
 #include "velox/vector/fuzzer/VectorFuzzer.h"
-#include "velox/vector/tests/VectorMaker.h"
+#include "velox/vector/tests/utils/VectorMaker.h"
 
 DEFINE_int64(fuzzer_seed, 99887766, "Seed for random input dataset generator");
 

velox/connectors/hive/storage_adapters/hdfs/tests/CMakeLists.txt

@@ -19,7 +19,7 @@ target_link_libraries(
   velox_file
   velox_hdfs
   velox_core
-  velox_exec_test_util
+  velox_exec_test_lib
   velox_hive_connector
   velox_dwio_common_exception
   velox_exec