Remove TIOVX CI job and add OpenVX 1.1/1.3 version compatibility

kiritigowda · claude · kiritigowda · commit 52df5de0435f · 2026-05-08T11:50:24.000-07:00
TIOVX PC emulation requires TI Processor SDK dependencies and doesn't
run reliably outside TI hardware. Keep OpenVX version detection and
compatibility wrappers so openvx-mark can build against 1.1 or 1.3.

Co-Authored-By: Claude Opus 4 &lt;noreply@anthropic.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -121,297 +121,3 @@ jobs:
           name: benchmark-comparison-khronos-mivisionx
           path: comparison.*
           if-no-files-found: ignore
-
-  benchmark-mivisionx-tiovx:
-    runs-on: ubuntu-latest
-    name: MIVisionX & TIOVX - Build, Benchmark & Compare
-
-    steps:
-      - name: Checkout openvx-mark
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install -y cmake build-essential
-
-      # --- MIVisionX (AMD OpenVX) ---
-      - name: Build MIVisionX (CPU backend)
-        run: |
-          git clone --depth 1 --branch develop https://github.com/ROCm/MIVisionX.git /tmp/openvx-mivisionx
-          cd /tmp/openvx-mivisionx && mkdir build && cd build
-          cmake -DBACKEND=CPU -DNEURAL_NET=OFF -DLOOM=OFF -DMIGRAPHX=OFF \
-                -DCMAKE_INSTALL_PREFIX=/tmp/openvx-mivisionx/install ..
-          make -j$(nproc)
-          make install
-
-      - name: Find MIVisionX libraries
-        id: mivisionx
-        run: |
-          LIB_DIR=$(dirname $(find /tmp/openvx-mivisionx -name "libopenvx.so" -not -path "*/build/*" | head -1))
-          echo "lib_dir=$LIB_DIR" >> "$GITHUB_OUTPUT"
-          echo "Found MIVisionX libraries in: $LIB_DIR"
-          ls -la "$LIB_DIR"/libopenvx* "$LIB_DIR"/libvxu* 2>/dev/null || true
-
-      - name: Build openvx-mark (MIVisionX)
-        run: |
-          mkdir build-mivisionx && cd build-mivisionx
-          cmake -DOPENVX_INCLUDES=/tmp/openvx-mivisionx/install/include/mivisionx \
-                -DOPENVX_LIB_DIR=${{ steps.mivisionx.outputs.lib_dir }} ..
-          cmake --build . -j$(nproc)
-
-      - name: Run benchmark (MIVisionX)
-        run: |
-          cd build-mivisionx
-          export LD_LIBRARY_PATH=${{ steps.mivisionx.outputs.lib_dir }}:$LD_LIBRARY_PATH
-          ./openvx-mark --resolution VGA --iterations 10 --warmup 3
-
-      # --- TIOVX (TI OpenVX - PC emulation build) ---
-      - name: Clone TIOVX
-        run: |
-          git clone --depth 1 https://github.com/TexasInstruments/tiovx.git /tmp/tiovx
-
-      - name: Build TIOVX (PC/Linux emulation)
-        run: |
-          cd /tmp/tiovx
-
-          # Create stub headers for missing TI SDK dependencies
-          # Stubs mirror the include paths used by TIOVX source files
-          mkdir -p stubs/utils/mem/include
-          mkdir -p stubs/utils/perf_stats/include
-
-          cat > stubs/app_mem_map.h << 'STUB_EOF'
-          #ifndef APP_MEM_MAP_H
-          #define APP_MEM_MAP_H
-          #define TIOVX_OBJ_DESC_MEM_SIZE (128U * 1024U * 1024U)
-          #endif
-          STUB_EOF
-
-          cat > stubs/utils/perf_stats/include/app_perf_stats.h << 'STUB_EOF'
-          #ifndef APP_PERF_STATS_H
-          #define APP_PERF_STATS_H
-          typedef struct { int dummy; } app_perf_stats_t;
-          static inline int appPerfStatsRegisterTask(void *a, const char *b) { (void)a; (void)b; return 0; }
-          static inline int appPerfStatsDeRegisterTask(void *a) { (void)a; return 0; }
-          #endif
-          STUB_EOF
-
-          # tivx_mem.c includes <utils/mem/include/app_mem.h>
-          cat > stubs/utils/mem/include/app_mem.h << 'STUB_EOF'
-          #ifndef APP_MEM_H
-          #define APP_MEM_H
-          #include <stdlib.h>
-          #include <stdint.h>
-          #include <string.h>
-
-          /* Heap ID enums used by tivx_mem.c */
-          #define APP_MEM_HEAP_DDR                   (0U)
-          #define APP_MEM_HEAP_L3                    (1U)
-          #define APP_MEM_HEAP_L2                    (2U)
-          #define APP_MEM_HEAP_L1                    (3U)
-          #define APP_MEM_HEAP_DDR_SCRATCH           (4U)
-          #define APP_MEM_HEAP_DDR_NON_CACHE         (5U)
-          #define APP_MEM_HEAP_DDR_NON_CACHE_SCRATCH (6U)
-          #define APP_MEM_HEAP_DDR_WT_CACHE          (7U)
-          #define APP_MEM_HEAP_DDR_SHARED            (8U)
-
-          static inline uint32_t appMemRegionQuery(uint32_t heap_id) {
-              (void)heap_id;
-              return 1U;
-          }
-          static inline void *appMemAlloc(uint32_t heap_id, uint32_t size, uint32_t align) {
-              (void)heap_id; (void)align;
-              void *ptr = malloc(size);
-              if (ptr) memset(ptr, 0, size);
-              return ptr;
-          }
-          static inline int32_t appMemFree(uint32_t heap_id, void *ptr, uint32_t size) {
-              (void)heap_id; (void)size;
-              free(ptr);
-              return 0;
-          }
-          static inline uint64_t appMemGetVirt2PhyBufPtr(uint64_t virt, uint32_t heap_id) {
-              (void)heap_id;
-              return virt;
-          }
-          static inline int32_t appMemGetDmaBufFd(void *virtAddr, int32_t *offset) {
-              (void)virtAddr;
-              if (offset) *offset = 0;
-              return -1;
-          }
-          static inline int32_t appMemTranslateDmaBufFd(uint32_t fd, uint32_t size, uint64_t *virtAddr, uint64_t *phyAddr) {
-              (void)fd; (void)size;
-              if (virtAddr) *virtAddr = 0;
-              if (phyAddr) *phyAddr = 0;
-              return -1;
-          }
-          static inline void *appMemMap(void *phys_ptr, uint32_t size) {
-              (void)size;
-              return phys_ptr;
-          }
-          static inline int32_t appMemUnMap(void *virt_ptr, uint32_t size) {
-              (void)virt_ptr; (void)size;
-              return 0;
-          }
-          #endif
-          STUB_EOF
-
-          # Also place app_mem.h at stubs/ for any direct includes
-          cp stubs/utils/mem/include/app_mem.h stubs/app_mem.h
-
-          cat > stubs/app_init.h << 'STUB_EOF'
-          #ifndef APP_INIT_H
-          #define APP_INIT_H
-          #endif
-          STUB_EOF
-
-          # Create a CMakeLists.txt for standalone PC build
-          cat > CMakeLists.txt << 'CMAKE_EOF'
-          cmake_minimum_required(VERSION 3.10)
-          project(tiovx C)
-
-          set(CMAKE_C_STANDARD 99)
-          set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
-          # SOC definition (required by tivx_config.h, J721E is the default)
-          add_definitions(-DSOC_J721E -DHOST_EMULATION -DLINUX -DPC)
-
-          # Include paths
-          include_directories(
-              ${CMAKE_SOURCE_DIR}/include
-              ${CMAKE_SOURCE_DIR}/source/include
-              ${CMAKE_SOURCE_DIR}/source/platform/pc/common
-              ${CMAKE_SOURCE_DIR}/source/platform/common/os/posix
-              ${CMAKE_SOURCE_DIR}/stubs
-              ${CMAKE_SOURCE_DIR}/kernels/include
-          )
-
-          # Suppress warnings for third-party code
-          add_compile_options(-w)
-
-          # Framework sources
-          file(GLOB FRAMEWORK_SRC source/framework/*.c)
-
-          # VXU sources
-          file(GLOB VXU_SRC source/vxu/*.c)
-
-          # Platform PC sources
-          file(GLOB PLATFORM_PC_SRC
-              source/platform/pc/linux/*.c
-              source/platform/pc/common/*.c
-          )
-
-          # POSIX OS abstraction
-          file(GLOB POSIX_SRC source/platform/common/os/posix/*.c)
-
-          # Platform common
-          set(PLATFORM_COMMON_SRC source/platform/common/tivx_host.c)
-          if(EXISTS "${CMAKE_SOURCE_DIR}/source/platform/common/tivx_init.c")
-              list(APPEND PLATFORM_COMMON_SRC source/platform/common/tivx_init.c)
-          endif()
-
-          # Core kernel host sources (kernel registration, not DSP implementations)
-          file(GLOB CORE_KERNEL_HOST_SRC kernels/openvx-core/host/*.c)
-
-          # Combine all sources
-          set(ALL_SRC
-              ${FRAMEWORK_SRC}
-              ${VXU_SRC}
-              ${PLATFORM_PC_SRC}
-              ${POSIX_SRC}
-              ${PLATFORM_COMMON_SRC}
-              ${CORE_KERNEL_HOST_SRC}
-          )
-
-          # Build shared libraries
-          add_library(openvx SHARED ${ALL_SRC})
-          target_link_libraries(openvx pthread rt dl m)
-
-          add_library(vxu SHARED ${VXU_SRC})
-          target_link_libraries(vxu openvx)
-
-          # Install
-          install(TARGETS openvx vxu DESTINATION lib)
-          install(DIRECTORY include/VX DESTINATION include)
-          CMAKE_EOF
-
-          mkdir build && cd build
-          cmake -DCMAKE_INSTALL_PREFIX=/tmp/tiovx/install .. 2>&1 || true
-          make -j$(nproc) 2>&1 || echo "TIOVX build had warnings/errors — checking if libraries were produced"
-          ls -la libopenvx.so libvxu.so 2>/dev/null || echo "Libraries not produced — TIOVX build failed"
-
-      - name: Find TIOVX libraries
-        id: tiovx
-        run: |
-          if [ -f /tmp/tiovx/build/libopenvx.so ]; then
-            echo "lib_dir=/tmp/tiovx/build" >> "$GITHUB_OUTPUT"
-            echo "build_ok=true" >> "$GITHUB_OUTPUT"
-            echo "Found TIOVX libraries"
-            ls -la /tmp/tiovx/build/libopenvx.so /tmp/tiovx/build/libvxu.so
-          else
-            echo "build_ok=false" >> "$GITHUB_OUTPUT"
-            echo "TIOVX build did not produce libraries — skipping benchmark"
-          fi
-
-      - name: Build openvx-mark (TIOVX)
-        if: steps.tiovx.outputs.build_ok == 'true'
-        run: |
-          mkdir build-tiovx && cd build-tiovx
-          cmake -DOPENVX_INCLUDES=/tmp/tiovx/include \
-                -DOPENVX_LIB_DIR=${{ steps.tiovx.outputs.lib_dir }} ..
-          cmake --build . -j$(nproc)
-
-      - name: Run benchmark (TIOVX)
-        if: steps.tiovx.outputs.build_ok == 'true'
-        run: |
-          cd build-tiovx
-          export LD_LIBRARY_PATH=${{ steps.tiovx.outputs.lib_dir }}:$LD_LIBRARY_PATH
-          ./openvx-mark --resolution VGA --iterations 10 --warmup 3
-
-      # --- Compare Results ---
-      - name: Compare benchmark results
-        if: steps.tiovx.outputs.build_ok == 'true'
-        run: |
-          MIVISIONX=build-mivisionx/benchmark_results/benchmark_results.json
-          TIOVX=build-tiovx/benchmark_results/benchmark_results.json
-
-          if [ ! -f "$MIVISIONX" ] || [ ! -f "$TIOVX" ]; then
-            echo "Skipping comparison — one or both benchmark results missing"
-            exit 0
-          fi
-
-          python3 scripts/compare_reports.py "$MIVISIONX" "$TIOVX" \
-            --output comparison-mivisionx-tiovx
-
-      - name: Post comparison to job summary
-        if: always()
-        run: |
-          if [ -f comparison-mivisionx-tiovx.md ]; then
-            cat comparison-mivisionx-tiovx.md >> "$GITHUB_STEP_SUMMARY"
-          else
-            echo "## TIOVX Comparison" >> "$GITHUB_STEP_SUMMARY"
-            echo "TIOVX build did not succeed — comparison skipped." >> "$GITHUB_STEP_SUMMARY"
-            echo "TIOVX requires TI Processor SDK dependencies that may not be available in CI." >> "$GITHUB_STEP_SUMMARY"
-          fi
-
-      - name: Upload MIVisionX results
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: benchmark-results-mivisionx-cpu-tiovx-job
-          path: build-mivisionx/benchmark_results/
-          if-no-files-found: ignore
-
-      - name: Upload TIOVX results
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: benchmark-results-tiovx-pc
-          path: build-tiovx/benchmark_results/
-          if-no-files-found: ignore
-
-      - name: Upload comparison report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: benchmark-comparison-mivisionx-tiovx
-          path: comparison-mivisionx-tiovx.*
-          if-no-files-found: ignore
diff --git a/include/openvx_version.h b/include/openvx_version.h
@@ -49,4 +49,43 @@
 #define OPENVX_HAS_1_3 0
 #endif
 
+// Compatibility wrappers: OpenVX 1.3 APIs that map to 1.1 equivalents
+#if !OPENVX_HAS_1_3
+
+static inline vx_threshold vxCreateThresholdForImage(vx_context ctx,
+    vx_enum thresh_type, vx_df_image /*in_fmt*/, vx_df_image /*out_fmt*/) {
+    return vxCreateThreshold(ctx, thresh_type, VX_TYPE_UINT8);
+}
+
+static inline vx_status vxCopyThresholdValue(vx_threshold thresh,
+    vx_pixel_value_t *value, vx_enum usage, vx_enum /*mem_type*/) {
+    if (usage == VX_WRITE_ONLY) {
+        vx_int32 v = value->U8;
+        return vxSetThresholdAttribute(thresh,
+            VX_THRESHOLD_THRESHOLD_VALUE, &v, sizeof(v));
+    }
+    return VX_ERROR_NOT_SUPPORTED;
+}
+
+static inline vx_status vxCopyThresholdRange(vx_threshold thresh,
+    vx_pixel_value_t *lower, vx_pixel_value_t *upper,
+    vx_enum usage, vx_enum /*mem_type*/) {
+    if (usage == VX_WRITE_ONLY) {
+        vx_int32 lo = lower->U8, hi = upper->U8;
+        vx_status s = vxSetThresholdAttribute(thresh,
+            VX_THRESHOLD_THRESHOLD_LOWER, &lo, sizeof(lo));
+        if (s != VX_SUCCESS) return s;
+        return vxSetThresholdAttribute(thresh,
+            VX_THRESHOLD_THRESHOLD_UPPER, &hi, sizeof(hi));
+    }
+    return VX_ERROR_NOT_SUPPORTED;
+}
+
+// OpenVX 1.1 uses vxSetRemapPoint per pixel instead of vxCopyRemapPatch
+#define OPENVX_USE_SET_REMAP_POINT 1
+
+#else
+#define OPENVX_USE_SET_REMAP_POINT 0
+#endif
+
 #endif // OPENVX_VERSION_H
diff --git a/src/benchmarks/node_feature.cpp b/src/benchmarks/node_feature.cpp
@@ -26,6 +26,7 @@
 
 #include "benchmark_runner.h"
 #include "benchmark_config.h"
+#include "openvx_version.h"
 #include "verify_utils.h"
 #include <VX/vx.h>
 #include <VX/vxu.h>
diff --git a/src/benchmarks/node_geometric.cpp b/src/benchmarks/node_geometric.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "benchmark_runner.h"
+#include "openvx_version.h"
 #include "verify_utils.h"
 #include <VX/vx.h>
 #include <VX/vx_nodes.h>
@@ -247,6 +248,11 @@ std::vector<BenchmarkCase> registerGeometricBenchmarks() {
             if (!in) return true;
             vx_image out = vxCreateImage(ctx, 64, 64, VX_DF_IMAGE_U8);
             vx_remap remap = vxCreateRemap(ctx, 64, 64, 64, 64);
+#if OPENVX_USE_SET_REMAP_POINT
+            for (vx_uint32 y = 0; y < 64; y++)
+                for (vx_uint32 x = 0; x < 64; x++)
+                    vxSetRemapPoint(remap, x, y, (vx_float32)x, (vx_float32)y);
+#else
             vx_rectangle_t rect = {0, 0, 64, 64};
             vx_size stride = 64 * sizeof(vx_coordinates2df_t);
             std::vector<vx_coordinates2df_t> coords(64 * 64);
@@ -257,6 +263,7 @@ std::vector<BenchmarkCase> registerGeometricBenchmarks() {
                 }
             vxCopyRemapPatch(remap, &rect, stride, coords.data(),
                              VX_TYPE_COORDINATES2DF, VX_WRITE_ONLY, VX_MEMORY_TYPE_HOST);
+#endif
             vx_status status = vxuRemap(ctx, in, remap, VX_INTERPOLATION_BILINEAR, out);
             if (status != VX_SUCCESS) {
                 vxReleaseRemap(&remap);
diff --git a/src/test_data_generator.cpp b/src/test_data_generator.cpp
