Add halide_error_streaming_vscale_invalid runtime error

Revert the changes in halide_error_vscale_invalid to
avoid potential runtime breaking changes.

Author: stevesuzuki-arm

src/CodeGen_ARM.cpp

@@ -1336,7 +1336,7 @@ void CodeGen_ARM::compile_func(const LoweredFunc &f,
             internal_assert(!in_streaming) << "Streaming mode in non-internal linkage func is unexpected\n";
             Expr runtime_vscale = Call::make(Int(32), Call::get_runtime_vscale, {}, Call::PureIntrinsic);
             Expr compiletime_vscale = Expr(effective_vscale);
-            std::vector<Expr> args{simple_name, std::string(""), runtime_vscale, compiletime_vscale};
+            std::vector<Expr> args{simple_name, runtime_vscale, compiletime_vscale};
             Expr error = Call::make(Int(32), "halide_error_vscale_invalid", args, Call::Extern);
             func.body = Block::make(AssertStmt::make(runtime_vscale == compiletime_vscale, error), func.body);
         }
@@ -1345,8 +1345,8 @@ void CodeGen_ARM::compile_func(const LoweredFunc &f,
             // because streaming task is basically internal linkage.
             Expr runtime_vscale = Call::make(Int(32), Call::get_runtime_streaming_vscale, {}, Call::PureIntrinsic);
             Expr compiletime_vscale = Expr(target.sme_streaming_vector_bits() / 128);
-            std::vector<Expr> args{simple_name, std::string("streaming"), runtime_vscale, compiletime_vscale};
-            Expr error = Call::make(Int(32), "halide_error_vscale_invalid", args, Call::Extern);
+            std::vector<Expr> args{simple_name, runtime_vscale, compiletime_vscale};
+            Expr error = Call::make(Int(32), "halide_error_streaming_vscale_invalid", args, Call::Extern);
             func.body = Block::make(AssertStmt::make(runtime_vscale == compiletime_vscale, error), func.body);
         }
     }

src/runtime/HalideRuntime.h

@@ -1279,6 +1279,10 @@ enum halide_error_code_t {
 
     /** Profiling failed for a pipeline invocation. */
     halide_error_code_cannot_profile_pipeline = -48,
+
+    /** "vscale" value of Streaming Scalable Vector detected in runtime does not
+     * match the streaming vscale value used in compilation. */
+    halide_error_code_streaming_vscale_invalid = -49,
 };
 
 /** Halide calls the functions below on various error conditions. The
@@ -1354,7 +1358,8 @@ extern int halide_error_storage_bound_too_small(void *user_context, const char *
                                                 int provided_size, int required_size);
 extern int halide_error_device_crop_failed(void *user_context);
 extern int halide_error_split_factor_not_positive(void *user_context, const char *func_name, const char *orig, const char *outer, const char *inner, const char *factor_str, int factor);
-extern int halide_error_vscale_invalid(void *user_context, const char *func_name, const char *prefix, int runtime_vscale, int compiletime_vscale);
+extern int halide_error_vscale_invalid(void *user_context, const char *func_name, int runtime_vscale, int compiletime_vscale);
+extern int halide_error_streaming_vscale_invalid(void *user_context, const char *func_name, int runtime_vscale, int compiletime_vscale);
 // @}
 
 /** Optional features a compilation Target can have.

src/runtime/errors.cpp

@@ -300,12 +300,20 @@ WEAK int halide_error_split_factor_not_positive(void *user_context, const char *
     return halide_error_code_split_factor_not_positive;
 }
 
-WEAK int halide_error_vscale_invalid(void *user_context, const char *func_name, const char *prefix, int runtime_vscale, int compiletime_vscale) {
+WEAK int halide_error_vscale_invalid(void *user_context, const char *func_name, int runtime_vscale, int compiletime_vscale) {
     error(user_context)
         << "The function " << func_name
-        << " is compiled with the assumption that " << prefix << " vscale of Scalable Vector is " << compiletime_vscale
-        << ". However, the detected runtime " << prefix << " vscale is " << runtime_vscale << ".";
+        << " is compiled with the assumption that vscale of Scalable Vector is " << compiletime_vscale
+        << ". However, the detected runtime vscale is " << runtime_vscale << ".";
     return halide_error_code_vscale_invalid;
 }
 
+WEAK int halide_error_streaming_vscale_invalid(void *user_context, const char *func_name, int runtime_vscale, int compiletime_vscale) {
+    error(user_context)
+        << "The function " << func_name
+        << " is compiled with the assumption that streaming vscale of Scalable Vector is " << compiletime_vscale
+        << ". However, the detected runtime streaming vscale is " << runtime_vscale << ".";
+    return halide_error_code_streaming_vscale_invalid;
+}
+
 }  // extern "C"

src/runtime/runtime_api.cpp

@@ -89,6 +89,7 @@ extern "C" __attribute__((used)) void *halide_runtime_api_functions[] = {
     (void *)&halide_error_unaligned_host_ptr,
     (void *)&halide_error_storage_bound_too_small,
     (void *)&halide_error_device_crop_failed,
+    (void *)&halide_error_streaming_vscale_invalid,
     (void *)&halide_error_vscale_invalid,
     (void *)&halide_float16_bits_to_double,
     (void *)&halide_float16_bits_to_float,