LoongArch: Rename ISA_BASE_LA64V100 to ISA_BASE_LA64

LoongArch ISA manual v1.10 suggests that software should not depend on
the ISA version number for marking processor features.  The ISA version
number is now defined as a collective name of individual ISA evolutions.
Since there is a independent ISA evolution mask now, we can drop the
version information from the base ISA.

gcc/ChangeLog:

	* config/loongarch/genopts/loongarch-strings: Rename.
	* config/loongarch/genopts/loongarch.opt.in: Same.
	* config/loongarch/loongarch-cpu.cc: Same.
	* config/loongarch/loongarch-def.cc: Same.
	* config/loongarch/loongarch-def.h: Same.
	* config/loongarch/loongarch-opts.cc: Same.
	* config/loongarch/loongarch-opts.h: Same.
	* config/loongarch/loongarch-str.h: Same.
	* config/loongarch/loongarch.opt: Same.

diff --git a/gcc/config/loongarch/genopts/loongarch-strings b/gcc/config/loongarch/genopts/loongarch-strings
index f40b014f0171606de26de18922fe92cf431ad972..ba47be31227f49a9c691a736e81a0c5fba0e86db 100644 (file)
--- a/gcc/config/loongarch/genopts/loongarch-strings
+++ b/gcc/config/loongarch/genopts/loongarch-strings
@@ -29,7 +29,7 @@ STR_CPU_LA464       la464
 STR_CPU_LA664        la664
 
 # Base architecture
-STR_ISA_BASE_LA64V100 la64
+STR_ISA_BASE_LA64 la64
 
 # -mfpu
 OPTSTR_ISA_EXT_FPU    fpu

diff --git a/gcc/config/loongarch/genopts/loongarch.opt.in b/gcc/config/loongarch/genopts/loongarch.opt.in
index e643deacd214e435e96639877897bcdb197e0dd1..38ac347c660d19b23728d532c6f0651a63c86883 100644 (file)
--- a/gcc/config/loongarch/genopts/loongarch.opt.in
+++ b/gcc/config/loongarch/genopts/loongarch.opt.in
@@ -33,7 +33,7 @@ Name(isa_base) Type(int)
 Basic ISAs of LoongArch:
 
 EnumValue
-Enum(isa_base) String(@@STR_ISA_BASE_LA64V100@@) Value(ISA_BASE_LA64V100)
+Enum(isa_base) String(@@STR_ISA_BASE_LA64@@) Value(ISA_BASE_LA64)
 
 ;; ISA extensions / adjustments
 Enum

diff --git a/gcc/config/loongarch/loongarch-cpu.cc b/gcc/config/loongarch/loongarch-cpu.cc
index e1771fc0b4fc2bb7f51e7fd004e255d467f7e893..97ac5fed9d83714c0b884015ef268e3e577503d4 100644 (file)
--- a/gcc/config/loongarch/loongarch-cpu.cc
+++ b/gcc/config/loongarch/loongarch-cpu.cc
@@ -133,7 +133,7 @@ fill_native_cpu_config (struct loongarch_target *tgt)
        switch (cpucfg_cache[1] & 0x3)
          {
            case 0x02:
-             tmp = ISA_BASE_LA64V100;
+             tmp = ISA_BASE_LA64;
              break;
 
            default:

diff --git a/gcc/config/loongarch/loongarch-def.cc b/gcc/config/loongarch/loongarch-def.cc
index 48d283150642649e0c5af7211790ec1cb2f26427..e8c129ce643a787933287d6aa820f8b83a748ac9 100644 (file)
--- a/gcc/config/loongarch/loongarch-def.cc
+++ b/gcc/config/loongarch/loongarch-def.cc
@@ -48,16 +48,16 @@ array_arch<loongarch_isa> loongarch_cpu_default_isa =
   array_arch<loongarch_isa> ()
     .set (CPU_LOONGARCH64,
          loongarch_isa ()
-           .base_ (ISA_BASE_LA64V100)
+           .base_ (ISA_BASE_LA64)
            .fpu_ (ISA_EXT_FPU64))
     .set (CPU_LA464,
          loongarch_isa ()
-           .base_ (ISA_BASE_LA64V100)
+           .base_ (ISA_BASE_LA64)
            .fpu_ (ISA_EXT_FPU64)
            .simd_ (ISA_EXT_SIMD_LASX))
     .set (CPU_LA664,
          loongarch_isa ()
-           .base_ (ISA_BASE_LA64V100)
+           .base_ (ISA_BASE_LA64)
            .fpu_ (ISA_EXT_FPU64)
            .simd_ (ISA_EXT_SIMD_LASX)
            .evolution_ (OPTION_MASK_ISA_DIV32 | OPTION_MASK_ISA_LD_SEQ_SA
@@ -153,7 +153,7 @@ array_tune<int> loongarch_cpu_multipass_dfa_lookahead = array_tune<int> ()
 
 array<const char *, N_ISA_BASE_TYPES> loongarch_isa_base_strings =
   array<const char *, N_ISA_BASE_TYPES> ()
-    .set (ISA_BASE_LA64V100, STR_ISA_BASE_LA64V100);
+    .set (ISA_BASE_LA64, STR_ISA_BASE_LA64);
 
 array<const char *, N_ISA_EXT_TYPES> loongarch_isa_ext_strings =
   array<const char *, N_ISA_EXT_TYPES> ()
@@ -189,15 +189,15 @@ array<array<loongarch_isa, N_ABI_EXT_TYPES>, N_ABI_BASE_TYPES>
          array<loongarch_isa, N_ABI_EXT_TYPES> ()
            .set (ABI_EXT_BASE,
                  loongarch_isa ()
-                   .base_ (ISA_BASE_LA64V100)
+                   .base_ (ISA_BASE_LA64)
                    .fpu_ (ISA_EXT_FPU64)))
     .set (ABI_BASE_LP64F,
          array<loongarch_isa, N_ABI_EXT_TYPES> ()
            .set (ABI_EXT_BASE,
                  loongarch_isa ()
-                   .base_ (ISA_BASE_LA64V100)
+                   .base_ (ISA_BASE_LA64)
                    .fpu_ (ISA_EXT_FPU32)))
     .set (ABI_BASE_LP64S,
          array<loongarch_isa, N_ABI_EXT_TYPES> ()
            .set (ABI_EXT_BASE,
-                 loongarch_isa ().base_ (ISA_BASE_LA64V100)));
+                 loongarch_isa ().base_ (ISA_BASE_LA64)));

diff --git a/gcc/config/loongarch/loongarch-def.h b/gcc/config/loongarch/loongarch-def.h
index 1fab4f4d315029a76b21fe956de533efa5d46cad..f8cb3adf509c1fd3b8c12ca4dbd7a27108107ecb 100644 (file)
--- a/gcc/config/loongarch/loongarch-def.h
+++ b/gcc/config/loongarch/loongarch-def.h
@@ -55,9 +55,9 @@ along with GCC; see the file COPYING3.  If not see
 
 /* enum isa_base */
 
-/* LoongArch V1.00.  */
-#define ISA_BASE_LA64V100      0
-#define N_ISA_BASE_TYPES       1
+/* LoongArch64 */
+#define ISA_BASE_LA64        0
+#define N_ISA_BASE_TYPES      1
 extern loongarch_def_array<const char *, N_ISA_BASE_TYPES>
   loongarch_isa_base_strings;
 

diff --git a/gcc/config/loongarch/loongarch-opts.cc b/gcc/config/loongarch/loongarch-opts.cc
index 9483060ab623d975ff799068a0ab680d209697b4..7eb1f2d4f2ecd497cbfc4f3019ab964655ad1b1f 100644 (file)
--- a/gcc/config/loongarch/loongarch-opts.cc
+++ b/gcc/config/loongarch/loongarch-opts.cc
@@ -567,17 +567,17 @@ isa_default_abi (const struct loongarch_isa *isa)
   switch (isa->fpu)
     {
       case ISA_EXT_FPU64:
-       if (isa->base >= ISA_BASE_LA64V100)
+       if (isa->base >= ISA_BASE_LA64)
          abi.base = ABI_BASE_LP64D;
        break;
 
       case ISA_EXT_FPU32:
-       if (isa->base >= ISA_BASE_LA64V100)
+       if (isa->base >= ISA_BASE_LA64)
          abi.base = ABI_BASE_LP64F;
        break;
 
       case ISA_EXT_NONE:
-       if (isa->base >= ISA_BASE_LA64V100)
+       if (isa->base >= ISA_BASE_LA64)
          abi.base = ABI_BASE_LP64S;
        break;
 
@@ -596,8 +596,8 @@ isa_base_compat_p (const struct loongarch_isa *set1,
 {
   switch (set2->base)
     {
-      case ISA_BASE_LA64V100:
-       return (set1->base >= ISA_BASE_LA64V100);
+      case ISA_BASE_LA64:
+       return (set1->base >= ISA_BASE_LA64);
 
       default:
        gcc_unreachable ();

diff --git a/gcc/config/loongarch/loongarch-opts.h b/gcc/config/loongarch/loongarch-opts.h
index aa0dd32f4116350ab0831bd9638ade654fbd710f..586e67e65ee1b50898fc8c1dc580ed1b60aae265 100644 (file)
--- a/gcc/config/loongarch/loongarch-opts.h
+++ b/gcc/config/loongarch/loongarch-opts.h
@@ -79,7 +79,7 @@ struct loongarch_flags {
 #define TARGET_DOUBLE_FLOAT      (la_target.isa.fpu == ISA_EXT_FPU64)
 #define TARGET_DOUBLE_FLOAT_ABI          (la_target.abi.base == ABI_BASE_LP64D)
 
-#define TARGET_64BIT             (la_target.isa.base == ISA_BASE_LA64V100)
+#define TARGET_64BIT             (la_target.isa.base == ISA_BASE_LA64)
 #define TARGET_ABI_LP64                  (la_target.abi.base == ABI_BASE_LP64D \
                                   || la_target.abi.base == ABI_BASE_LP64F \
                                   || la_target.abi.base == ABI_BASE_LP64S)

diff --git a/gcc/config/loongarch/loongarch-str.h b/gcc/config/loongarch/loongarch-str.h
index 2221c57f78e009d43740174cf90c6777392f2950..0a6a36c5783ebe3fa885e115b00ad1942734b4fe 100644 (file)
--- a/gcc/config/loongarch/loongarch-str.h
+++ b/gcc/config/loongarch/loongarch-str.h
@@ -32,7 +32,7 @@ along with GCC; see the file COPYING3.  If not see
 #define STR_CPU_LA464 "la464"
 #define STR_CPU_LA664 "la664"
 
-#define STR_ISA_BASE_LA64V100 "la64"
+#define STR_ISA_BASE_LA64 "la64"
 
 #define OPTSTR_ISA_EXT_FPU "fpu"
 #define STR_NONE "none"

diff --git a/gcc/config/loongarch/loongarch.opt b/gcc/config/loongarch/loongarch.opt
index 8b36f1a1495eee7a3e1ebb08e32f08257fc77c93..76b42d51d0977d7453d7520b235ce692647c98c3 100644 (file)
--- a/gcc/config/loongarch/loongarch.opt
+++ b/gcc/config/loongarch/loongarch.opt
@@ -41,7 +41,7 @@ Name(isa_base) Type(int)
 Basic ISAs of LoongArch:
 
 EnumValue
-Enum(isa_base) String(la64) Value(ISA_BASE_LA64V100)
+Enum(isa_base) String(la64) Value(ISA_BASE_LA64)
 
 ;; ISA extensions / adjustments
 Enum