use DTO_API define to make API path independent of transparent intercept

Author: byrnedj

cachelib/CMakeLists.txt

@@ -50,10 +50,23 @@ if (BUILD_WITH_DTO)
     find_package(DTO REQUIRED)
     if (DTO_FOUND)
         message(STATUS "DTO found, remember to configure DSA devices for acceleration. If no DSA device is found, cachelib will fallback to software path.")
-        add_compile_definitions(HAVE_DTO)
     endif()
 endif ()
 
+include(CMakeDependentOption)
+# USE_DTO_API is only meaningful if BUILD_WITH_DTO is ON *and* DTO was found
+cmake_dependent_option(
+  USE_DTO_API
+  "Use DTO library API functions for DSA acceleration."
+  OFF
+  "BUILD_WITH_DTO;DTO_FOUND"
+  OFF
+)
+if (USE_DTO_API)
+    message(STATUS "Using DTO API for offloading")
+    add_compile_definitions(DTO_API)
+endif()
+
 
 set(BIN_INSTALL_DIR bin CACHE STRING
     "The subdirectory where binaries should be installed")

cachelib/cachebench/runner/CacheStressor.h

@@ -28,7 +28,7 @@
 #include <thread>
 #include <unordered_set>
 
-#ifdef HAVE_DTO
+#ifdef DTO_API
 #include <dto.h>
 #define DTO_DSA_MIN_THRESHOLD (32 * 1024)
 #endif
@@ -48,7 +48,7 @@ namespace cachebench {
 
 constexpr uint32_t kNvmCacheWarmUpCheckRate = 1000;
 
-#ifdef HAVE_DTO
+#ifdef DTO_API
 void async_memcpy_callback(void *arg) {
     auto &fn = *reinterpret_cast<std::function<void(void)>*>(arg);
     fn();
@@ -505,7 +505,7 @@ class CacheStressor : public Stressor {
       ++stats.setFailure;
       return OpResultType::kSetFailure;
     } else {
-#ifdef HAVE_DTO
+#ifdef DTO_API
       if (config_.useDTOAsync && size >= DTO_DSA_MIN_THRESHOLD) {
         auto insertToCache = [&] {
             cache_->insertOrReplace(it);

cachelib/navy/block_cache/BlockCache.cpp

@@ -23,7 +23,7 @@
 #include <cstring>
 #include <utility>
 
-#ifdef HAVE_DTO
+#ifdef DTO_API
 #include <dto.h>
 #endif
 
@@ -35,7 +35,7 @@
 
 namespace facebook::cachelib::navy {
 
-#ifdef HAVE_DTO
+#ifdef DTO_API
 void async_memcpy_crc_cb(void *arg) {
     auto &fn = *reinterpret_cast<std::function<void(void)>*>(arg);
     fn();
@@ -714,7 +714,7 @@ Status BlockCache::writeEntry(RelAddress addr,
   auto desc = new (buffer.data() + descOffset)
       EntryDesc(hk.key().size(), value.size(), hk.keyHash());
   if (checksumData_) {
-#ifdef HAVE_DTO
+#ifdef DTO_API
     auto keyCopy = [hk, descOffset, &buffer]() {
       // Copy the key to the buffer at the end
       buffer.copyFrom(descOffset - hk.key().size(), makeView(hk.key()));

cachelib/navy/common/Hash.cpp

@@ -17,7 +17,7 @@
 #include "cachelib/navy/common/Hash.h"
 
 #include <folly/hash/Checksum.h>
-#ifdef HAVE_DTO
+#ifdef DTO_API
 #include <dto.h>
 #endif
 
@@ -27,7 +27,7 @@ uint64_t hashBuffer(BufferView key, uint64_t seed) {
 }
 
 uint32_t checksum(BufferView data, uint32_t startingChecksum) {
-#ifdef HAVE_DTO
+#ifdef DTO_API
   return dto_crc(data.data(), data.size(), nullptr, nullptr);
 #else
   return folly::crc32(data.data(), data.size(), startingChecksum);