Remove const intrinsics flags for xtensa instead of adding too much #ifdef

Author: zhanheng1

core/iwasm/aot/aot_intrinsic.c

@@ -877,10 +877,6 @@ aot_intrinsic_fill_capability_flags(AOTCompContext *comp_ctx)
         add_f64_common_intrinsics(comp_ctx);
         add_i64_common_intrinsics(comp_ctx);
         add_common_float_integer_conversion(comp_ctx);
-        add_intrinsic_capability(comp_ctx, AOT_INTRINSIC_FLAG_F32_CONST);
-        add_intrinsic_capability(comp_ctx, AOT_INTRINSIC_FLAG_F64_CONST);
-        add_intrinsic_capability(comp_ctx, AOT_INTRINSIC_FLAG_I32_CONST);
-        add_intrinsic_capability(comp_ctx, AOT_INTRINSIC_FLAG_I64_CONST);
     }
     else {
         /*

core/iwasm/compilation/aot_emit_const.c

@@ -12,7 +12,6 @@ aot_compile_op_i32_const(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
 {
     LLVMValueRef value;
 
-#if !defined(BUILD_TARGET_XTENSA)
     if (comp_ctx->is_indirect_mode
         && aot_intrinsic_check_capability(comp_ctx, "i32.const")) {
         WASMValue wasm_value;
@@ -24,7 +23,6 @@ aot_compile_op_i32_const(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
         }
     }
     else
-#endif
     {
         value = I32_CONST((uint32)i32_const);
         CHECK_LLVM_CONST(value);
@@ -43,7 +41,6 @@ aot_compile_op_i64_const(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
 {
     LLVMValueRef value;
 
-#if !defined(BUILD_TARGET_XTENSA)
     if (comp_ctx->is_indirect_mode
         && aot_intrinsic_check_capability(comp_ctx, "i64.const")) {
         WASMValue wasm_value;
@@ -55,7 +52,6 @@ aot_compile_op_i64_const(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
         }
     }
     else
-#endif
     {
         value = I64_CONST((uint64)i64_const);
         CHECK_LLVM_CONST(value);
@@ -74,7 +70,6 @@ aot_compile_op_f32_const(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
 {
     LLVMValueRef alloca, value;
 
-#if !defined(BUILD_TARGET_XTENSA)
     if (comp_ctx->is_indirect_mode
         && aot_intrinsic_check_capability(comp_ctx, "f32.const")) {
         WASMValue wasm_value;
@@ -87,9 +82,6 @@ aot_compile_op_f32_const(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
         PUSH_F32(value);
     }
     else if (!isnan(f32_const)) {
-#else
-    if (!isnan(f32_const)) {
-#endif
         value = F32_CONST(f32_const);
         CHECK_LLVM_CONST(value);
         PUSH_F32(value);
@@ -131,7 +123,6 @@ aot_compile_op_f64_const(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
 {
     LLVMValueRef alloca, value;
 
-#if !defined(BUILD_TARGET_XTENSA)
     if (comp_ctx->is_indirect_mode
         && aot_intrinsic_check_capability(comp_ctx, "f64.const")) {
         WASMValue wasm_value;
@@ -144,9 +135,6 @@ aot_compile_op_f64_const(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
         PUSH_F64(value);
     }
     else if (!isnan(f64_const)) {
-#else
-    if (!isnan(f64_const)) {
-#endif
         value = F64_CONST(f64_const);
         CHECK_LLVM_CONST(value);
         PUSH_F64(value);

core/iwasm/compilation/aot_emit_memory.c

@@ -139,7 +139,6 @@ aot_check_memory_overflow(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
 
     is_target_64bit = (comp_ctx->pointer_size == sizeof(uint64)) ? true : false;
 
-#if !defined(BUILD_TARGET_XTENSA)
     if (comp_ctx->is_indirect_mode
         && aot_intrinsic_check_capability(
             comp_ctx, MEMORY64_COND_VALUE("i64.const", "i32.const"))) {
@@ -149,7 +148,6 @@ aot_check_memory_overflow(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
             wasm_value.i64 = offset;
         }
         else
-#endif
         {
             wasm_value.i32 = (int32)offset;
         }