Added diff proposal to reuse target.llvm_get_vector_width

Author: fzi-peccia

src/meta_schedule/space_generator/space_generator.cc

@@ -18,9 +18,7 @@
  */
 #include <tvm/ffi/reflection/registry.h>
 
-#include "../../runtime/regex.h"
 #include "../../target/parsers/aprofile.h"
-#include "../../target/parsers/cpu.h"
 #include "../utils.h"
 
 namespace tvm {
@@ -41,13 +39,14 @@ String GetRuleKindFromTarget(const Target& target) {
         return "avx512";
       }
     }
+    bool have_rvv = target_has_feature_fn_ptr("v", target).cast<bool>();
+    if (have_rvv) {
+      return "rvv";
+    }
 
     TargetJSON target_json = target::parsers::aprofile::ParseTarget(target->Export());
     TargetFeatures afeatures = Downcast<TargetFeatures>(target_json.at("features"));
 
-    if (Downcast<Bool>(afeatures.at("has_rvv"))) {
-      return "rvv";
-    }
     if (Downcast<Bool>(afeatures.at("has_dotprod"))) {
       return "dotprod";
     }
@@ -88,28 +87,10 @@ String GetRuleKindFromTarget(const Target& target) {
   throw;
 }
 
-std::string GetRISCVMarchFromTarget(const Target& target) {
-  if (target->kind->name == "c") {
-    if (Optional<String> opt_march = target->GetAttr<String>("march")) {
-      return opt_march.value();
-    }
-  }
-  return "";
-}
-
-int GetRISCVVLENFromCTarget(const Target& target) {
-  auto march = GetRISCVMarchFromTarget(target);
-  int vlen = 0;
-  if (march.find("zvl") != std::string::npos) {
-    vlen = tvm::target::parsers::cpu::extractVLENFromString(march);
-  }
-  return vlen;
-}
-
 int GetRISCVVLENFromLLVMTarget(const Target& target) {
-  TargetJSON target_json = target::parsers::aprofile::ParseTarget(target->Export());
-  TargetFeatures afeatures = Downcast<TargetFeatures>(target_json.at("features"));
-  int vlen = Downcast<Integer>(afeatures.at("rvv_vlen"))->value;
+  static auto llvm_get_vector_width_fn =
+      tvm::ffi::Function::GetGlobalRequired("target.llvm_get_vector_width");
+  const int vlen = llvm_get_vector_width_fn(target).cast<int>();
   return vlen;
 }
 

src/target/parsers/aprofile.cc

@@ -27,10 +27,8 @@
 #include <memory>
 #include <string>
 
-#include "../../runtime/regex.h"
 #include "../../support/utils.h"
 #include "../llvm/llvm_instance.h"
-#include "cpu.h"
 
 namespace tvm {
 namespace target {
@@ -82,16 +80,6 @@ bool CheckContains(Array<String> array, String predicate) {
   return std::any_of(array.begin(), array.end(), [&](String var) { return var == predicate; });
 }
 
-int FindRISCVVLEN(Map<String, String> features) {
-  int vlen = 128;
-  for (auto const& feature : features) {
-    std::string feature_str = Downcast<String>(feature.first);
-    if (feature_str.find("zvl") != std::string::npos) {
-      vlen = tvm::target::parsers::cpu::extractVLENFromString(feature_str);
-    }
-  }
-  return vlen;
-}
 
 static TargetFeatures GetFeatures(TargetJSON target) {
 #ifdef TVM_LLVM_VERSION
@@ -122,8 +110,6 @@ static TargetFeatures GetFeatures(TargetJSON target) {
   return {{"is_aarch64", Bool(IsAArch64(mtriple))},
           {"has_asimd", Bool(has_feature("neon"))},
           {"has_sve", Bool(has_feature("sve"))},
-          {"has_rvv", Bool(has_feature("v"))},
-          {"rvv_vlen", Integer(FindRISCVVLEN(features))},
           {"has_dotprod", Bool(has_feature("dotprod"))},
           {"has_matmul_i8", Bool(has_feature("i8mm"))},
           {"has_fp16_simd", Bool(has_feature("fullfp16"))},

src/target/parsers/cpu.cc

@@ -60,28 +60,6 @@ TargetJSON ParseTarget(TargetJSON target) {
   return target;
 }
 
-int extractVLENFromString(const std::string& input) {
-  for (size_t i = 0; i + 4 <= input.size(); ++i) {
-    // Look for the starting sequence "zvl"
-    if (input[i] == 'z' && input[i + 1] == 'v' && input[i + 2] == 'l') {
-      size_t j = i + 3;
-      std::string number;
-
-      // Collect digits
-      while (j < input.size() && std::isdigit(input[j])) {
-        number += input[j];
-        ++j;
-      }
-
-      // Check if followed by 'b' after digits
-      if (!number.empty() && j < input.size() && input[j] == 'b') {
-        return std::stoi(number);  // Convert the number to int
-      }
-    }
-  }
-
-  throw std::runtime_error("No valid pattern found");
-}
 
 }  // namespace cpu
 }  // namespace parsers

src/target/parsers/cpu.h

@@ -27,15 +27,13 @@
 
 #include <tvm/target/target.h>
 
-#include <string>
 
 namespace tvm {
 namespace target {
 namespace parsers {
 namespace cpu {
 
 TargetJSON ParseTarget(TargetJSON target);
-int extractVLENFromString(const std::string& input);
 
 }  // namespace cpu
 }  // namespace parsers