Fix order of the target builtins definitions and parameter signs.

openhwgroup · Nov 10, 2023 · e1a8af0 · e1a8af0
1 parent 6e04918
commit e1a8af0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/clang/include/clang/Basic/BuiltinsRISCVCOREV.def b/clang/include/clang/Basic/BuiltinsRISCVCOREV.def
@@ -80,6 +80,12 @@ TARGET_BUILTIN(simd_abs_h, "UZiUZi", "nc", "xcvsimd")
 TARGET_BUILTIN(simd_abs_b, "UZiUZi", "nc", "xcvsimd")
 PSEUDO_BUILTIN(simd_neg_h, "UZiUZi", "nc", "xcvsimd")
 PSEUDO_BUILTIN(simd_neg_b, "UZiUZi", "nc", "xcvsimd")
+TARGET_BUILTIN(simd_extract_h, "ZiUZiUc", "nc", "xcvsimd")
+TARGET_BUILTIN(simd_extract_b, "ZiUZiUc", "nc", "xcvsimd")
+TARGET_BUILTIN(simd_extractu_h, "UZiUZiUc", "nc", "xcvsimd")
+TARGET_BUILTIN(simd_extractu_b, "UZiUZiUc", "nc", "xcvsimd")
+TARGET_BUILTIN(simd_insert_h, "UZiUZiUZiIUc", "nc", "xcvsimd")
+TARGET_BUILTIN(simd_insert_b, "UZiUZiUZiIUc", "nc", "xcvsimd")
 TARGET_BUILTIN(simd_dotup_h, "UZiUZiUZi", "nc", "xcvsimd")
 TARGET_BUILTIN(simd_dotup_b, "UZiUZiUZi", "nc", "xcvsimd")
 TARGET_BUILTIN(simd_dotup_sc_h, "UZiUZiUs", "nc", "xcvsimd")
@@ -104,12 +110,6 @@ TARGET_BUILTIN(simd_sdotsp_h, "ZiUZiUZiZi", "nc", "xcvsimd")
 TARGET_BUILTIN(simd_sdotsp_b, "ZiUZiUZiZi", "nc", "xcvsimd")
 TARGET_BUILTIN(simd_sdotsp_sc_h, "ZiUZiSsZi", "nc", "xcvsimd")
 TARGET_BUILTIN(simd_sdotsp_sc_b, "ZiUZiScZi", "nc", "xcvsimd")
-TARGET_BUILTIN(simd_extract_h, "ZiUZiUc", "nc", "xcvsimd")
-TARGET_BUILTIN(simd_extract_b, "ZiUZiUc", "nc", "xcvsimd")
-TARGET_BUILTIN(simd_extractu_h, "UZiUZiUc", "nc", "xcvsimd")
-TARGET_BUILTIN(simd_extractu_b, "UZiUZiUc", "nc", "xcvsimd")
-TARGET_BUILTIN(simd_insert_h, "UZiUZiUZiIUc", "nc", "xcvsimd")
-TARGET_BUILTIN(simd_insert_b, "UZiUZiUZiIUc", "nc", "xcvsimd")
 TARGET_BUILTIN(simd_shuffle_h, "UZiUZiUZi", "nc", "xcvsimd")
 TARGET_BUILTIN(simd_shuffle_b, "UZiUZiUZi", "nc", "xcvsimd")
 TARGET_BUILTIN(simd_shuffle_sci_h, "UZiUZiUc", "nc", "xcvsimd")
@@ -177,8 +177,8 @@ TARGET_BUILTIN(bitmanip_cnt, "UZcUZi", "nc", "xcvbitmanip")
 TARGET_BUILTIN(bitmanip_ror, "UZiUZiUZi", "nc", "xcvbitmanip")
 TARGET_BUILTIN(bitmanip_bitrev, "UZiUZiIUcIUc", "nc", "xcvbitmanip")
 
-TARGET_BUILTIN(mac_mac, "UZiUZiUZiUZi", "nc", "xcvmac")
-TARGET_BUILTIN(mac_msu, "UZiUZiUZiUZi", "nc", "xcvmac")
+TARGET_BUILTIN(mac_mac, "SZiSZiSZiSZi", "nc", "xcvmac")
+TARGET_BUILTIN(mac_msu, "SZiSZiSZiSZi", "nc", "xcvmac")
 TARGET_BUILTIN(mac_muluN, "UZiUZiUZiUc", "nc", "xcvmac")
 TARGET_BUILTIN(mac_mulhhuN, "UZiUZiUZiUc", "nc", "xcvmac")
 TARGET_BUILTIN(mac_mulsN, "SZiUZiUZiUc", "nc", "xcvmac")
@@ -191,7 +191,7 @@ TARGET_BUILTIN(mac_macuN, "UZiUZiUZiUZiUc", "nc", "xcvmac")
 TARGET_BUILTIN(mac_machhuN, "UZiUZiUZiUZiUc", "nc", "xcvmac")
 TARGET_BUILTIN(mac_macsN, "SZiUZiUZiSZiUc", "nc", "xcvmac")
 TARGET_BUILTIN(mac_machhsN, "SZiUZiUZiSZiUc", "nc", "xcvmac")
-TARGET_BUILTIN(mac_macuRN, "UZiUZiUZiSZiUc", "nc", "xcvmac")
+TARGET_BUILTIN(mac_macuRN, "UZiUZiUZiUZiUc", "nc", "xcvmac")
 TARGET_BUILTIN(mac_machhuRN, "UZiUZiUZiUZiUc", "nc", "xcvmac")
 TARGET_BUILTIN(mac_macsRN, "SZiUZiUZiSZiUc", "nc", "xcvmac")
 TARGET_BUILTIN(mac_machhsRN, "SZiUZiUZiSZiUc", "nc", "xcvmac")
@@ -209,11 +209,11 @@ TARGET_BUILTIN(alu_extbz, "UZiUc", "nc", "xcvalu")
 
 TARGET_BUILTIN(alu_clip, "ZiZiUZi", "nc", "xcvalu")
 TARGET_BUILTIN(alu_clipu, "UZiUZiUZi", "nc", "xcvalu")
-TARGET_BUILTIN(alu_addN, "ZiZiUZiUc", "nc", "xcvalu")
+TARGET_BUILTIN(alu_addN, "ZiZiZiUc", "nc", "xcvalu")
 TARGET_BUILTIN(alu_adduN, "UZiUZiUZiUc", "nc", "xcvalu")
 TARGET_BUILTIN(alu_addRN, "ZiZiZiUc", "nc", "xcvalu")
 TARGET_BUILTIN(alu_adduRN, "UZiUZiUZiUc", "nc", "xcvalu")
-TARGET_BUILTIN(alu_subN, "ZiZiUZiUc", "nc", "xcvalu")
+TARGET_BUILTIN(alu_subN, "ZiZiZiUc", "nc", "xcvalu")
 TARGET_BUILTIN(alu_subuN, "UZiUZiUZiUc", "nc", "xcvalu")
 TARGET_BUILTIN(alu_subRN, "ZiZiZiUc", "nc", "xcvalu")
 TARGET_BUILTIN(alu_subuRN, "UZiUZiUZiUc", "nc", "xcvalu")

diff --git a/clang/lib/Headers/riscv_corev_simd.h b/clang/lib/Headers/riscv_corev_simd.h
@@ -392,15 +392,15 @@ unsigned long __riscv_cv_simd_shuffle_h(unsigned long a, unsigned long flgs) {
   return __builtin_riscv_cv_simd_shuffle_h(a, flgs);
 }
 
+unsigned long __riscv_cv_simd_shuffle_b(unsigned long a, unsigned long b) {
+  return __builtin_riscv_cv_simd_shuffle_b(a, b);
+}
+
 unsigned long __riscv_cv_simd_shuffle_sci_h(unsigned long a,
                                             const uint8_t flgs) {
   return __builtin_riscv_cv_simd_shuffle_sci_h(a, flgs);
 }
 
-unsigned long __riscv_cv_simd_shuffle_b(unsigned long a, unsigned long b) {
-  return __builtin_riscv_cv_simd_shuffle_b(a, b);
-}
-
 unsigned long __riscv_cv_simd_shuffle_sci_b(unsigned long a,
                                             const uint8_t flgs) {
   return __builtin_riscv_cv_simd_shuffle_sci_b(a, flgs);