[Misc] Define HiSparse source readiness interface

.github/workflows/_build_csrc_cache.yaml

@@ -152,7 +152,7 @@ jobs:
           fi
           git fetch "$BASE_REMOTE" "$BASE_REF"
           git cat-file -e "${BASE_SHA}^{commit}"
-          git rebase "$BASE_SHA"
+          git merge-base --is-ancestor "$BASE_SHA" HEAD || git rebase "$BASE_SHA"
 
       - name: Update submodules
         run: |

.github/workflows/_ensure_csrc_cache.yaml

@@ -139,7 +139,7 @@ jobs:
           fi
           git fetch "$BASE_REMOTE" "$BASE_REF"
           git cat-file -e "${BASE_SHA}^{commit}"
-          git rebase "$BASE_SHA"
+          git merge-base --is-ancestor "$BASE_SHA" HEAD || git rebase "$BASE_SHA"
 
       - name: Calculate csrc hash
         id: hash

.github/workflows/_selected_tests.yaml

@@ -161,7 +161,7 @@ jobs:
             BASE_SHA=$(git rev-parse FETCH_HEAD)
           fi
           git cat-file -e "${BASE_SHA}^{commit}"
-          git rebase "$BASE_SHA"
+          git merge-base --is-ancestor "$BASE_SHA" HEAD || git rebase "$BASE_SHA"
           git submodule sync --recursive
           git submodule update --init --recursive
 

.github/workflows/_selected_tests_upstream.yaml

@@ -146,7 +146,7 @@ jobs:
                 BASE_SHA=$(git rev-parse FETCH_HEAD)
               fi
               git cat-file -e "${BASE_SHA}^{commit}"
-              git rebase "$BASE_SHA"
+              git merge-base --is-ancestor "$BASE_SHA" HEAD || git rebase "$BASE_SHA"
               git submodule sync --recursive
               git submodule update --init --recursive
 

.github/workflows/pr_test.yaml

@@ -531,7 +531,7 @@ jobs:
             exit 1
           fi
 
-          git rebase "$BASE_SHA"
+          git merge-base --is-ancestor "$BASE_SHA" HEAD || git rebase "$BASE_SHA"
           echo "base_sha=$BASE_SHA" >> "$GITHUB_OUTPUT"
 
       - name: Validate test coverage config

.github/workflows/scripts/estimated_times.yaml

@@ -15,6 +15,9 @@ estimated_times:
   tests/e2e/pull_request/one_card/test_kv_pool_accuracy.py: 410
   tests/e2e/pull_request/one_card/test_flash_attn_precision.py: 30
   tests/e2e/pull_request/one_card/test_swiglu_mx_quant.py: 30
+  tests/e2e/pull_request/one_card/test_hisparse_attention.py: 30
+  tests/e2e/pull_request/one_card/test_hisparse_ops.py: 30
+  tests/e2e/pull_request/one_card/test_hisparse_prefill_staging.py: 30
   tests/e2e/pull_request/four_card/model_runner_v2/test_kvpp_pp.py: 300
   tests/e2e/pull_request/four_card/test_kvpp_pd.py: 230
   tests/e2e/pull_request/two_card/test_kvpp.py: 290

.github/workflows/scripts/test_config.yaml

@@ -47,6 +47,9 @@ curated_tests:
     - tests/e2e/pull_request/one_card/test_mla_fp8_decode_layout_a5.py
     - tests/e2e/pull_request/one_card/test_flash_attn_precision.py
     - tests/e2e/pull_request/one_card/test_swiglu_mx_quant.py
+    - tests/e2e/pull_request/one_card/test_hisparse_attention.py
+    - tests/e2e/pull_request/one_card/test_hisparse_ops.py
+    - tests/e2e/pull_request/one_card/test_hisparse_prefill_staging.py
 
 # === Skipped Tests ===
 # Removed from any selection after directory scanning, so they are never
@@ -119,6 +122,8 @@ runner_mapping:
     default: a5-4
   tests/e2e/pull_request/one_card/test_swiglu_mx_quant\.py$:
     default: a5-4
+  tests/e2e/pull_request/one_card/test_hisparse_(attention|ops|prefill_staging)\.py$:
+    default: a5-4
   tests/e2e/pull_request/one_card:
     default: a2-1
     310p: 310p-1

CMakeLists.txt

@@ -232,3 +232,18 @@ if(SOC_VERSION MATCHES "ascend310p.*|ascend950")
 else()
   install(TARGETS vllm_ascend_C vllm_ascend_kernels DESTINATION ${VLLM_ASCEND_INSTALL_PATH})
 endif()
+
+# SIMT HiSparse kernels use CANN's ASC CMake language integration. Other SOCs
+# retain their existing build and report HiSparse unavailable when selected.
+if(SOC_VERSION MATCHES "ascend950")
+  find_path(HISPARSE_SIMT_INCLUDE_DIR simt_api/asc_simt.h
+    PATHS
+      ${ASCEND_HOME_PATH}/asc/include
+      ${ASCEND_HOME_PATH}/${CMAKE_SYSTEM_PROCESSOR}-linux/asc/include
+    NO_DEFAULT_PATH)
+  if(HISPARSE_SIMT_INCLUDE_DIR)
+    add_subdirectory(csrc/hisparse)
+    target_compile_definitions(vllm_ascend_C PRIVATE VLLM_ASCEND_ENABLE_HISPARSE_RESOLVER)
+    target_link_libraries(vllm_ascend_C PRIVATE vllm_ascend_hisparse)
+  endif()
+endif()

csrc/hisparse/CMakeLists.txt

@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: Apache-2.0
+# CANN's ASC integration supplies the compiler, archive rules and runtime links.
+find_package(ASC REQUIRED CONFIG PATHS
+    ${ASCEND_HOME_PATH}/lib64/cmake
+    ${ASCEND_HOME_PATH}/${CMAKE_SYSTEM_PROCESSOR}-linux/lib64/cmake
+    NO_DEFAULT_PATH)
+set(CMAKE_ASC_ARCHITECTURES dav-3510)
+enable_language(ASC)
+
+ascendc_library(vllm_ascend_hisparse STATIC hisparse_resolver.cpp)
+target_include_directories(vllm_ascend_hisparse PRIVATE ${HISPARSE_SIMT_INCLUDE_DIR})
+# The AscendC entry launches a SIMT vector function through asc_vf_call. Keep
+# the mixed programming mode; --enable-simt selects a pure SIMT translation unit.
+target_compile_options(vllm_ascend_hisparse PRIVATE -O2)
+# Reserve space for the descriptor and runtime overhead within the target UB.
+target_compile_definitions(vllm_ascend_hisparse PRIVATE HISPARSE_RESOLVER_UB_BYTES=175616)