[gcc(refs/vendors/riscv/heads/gcc-13-with-riscv-opts)] RISC-V: Remove duplicate `#include "riscv-vector-switch.def"`

[gcc(refs/vendors/riscv/heads/gcc-13-with-riscv-opts)] RISC-V: Remove duplicate `#include "riscv-vector-switch.def"`

[Jeff Law]

https://gcc.gnu.org/g:17f9b68a95fb084daa02590ddc0890fd2e1cd948

commit 17f9b68a95fb084daa02590ddc0890fd2e1cd948
Author: Lehua Ding <lehua.ding@rivai.ai>
Date:   Tue Jun 13 18:59:09 2023 +0800

    RISC-V: Remove duplicate `#include "riscv-vector-switch.def"`
    
    Hi,
    
    This patch remove the duplicate `#include "riscv-vector-switch.def"` statement
    and add #undef for ENTRY and TUPLE_ENTRY macros later.
    
    Best,
    Lehua
    
    gcc/ChangeLog:
    
            * config/riscv/riscv-v.cc (struct mode_vtype_group): Remove duplicate
            #include.
            (ENTRY): Undef.
            (TUPLE_ENTRY): Undef.

Diff:
---
 gcc/config/riscv/riscv-v.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcc/config/riscv/riscv-v.cc b/gcc/config/riscv/riscv-v.cc
index d797326d736..e07d5c2901a 100644
--- a/gcc/config/riscv/riscv-v.cc
+++ b/gcc/config/riscv/riscv-v.cc
@@ -1254,7 +1254,6 @@ struct mode_vtype_group
   ratio_for_min_vlen64[MODE##mode] = RATIO_FOR_MIN_VLEN64;                     \
   vlmul_for_for_vlen128[MODE##mode] = VLMUL_FOR_MIN_VLEN128;                   \
   ratio_for_for_vlen128[MODE##mode] = RATIO_FOR_MIN_VLEN128;
-#include "riscv-vector-switch.def"
 #define TUPLE_ENTRY(MODE, REQUIREMENT, SUBPART_MODE, NF, VLMUL_FOR_MIN_VLEN32, \
 		    RATIO_FOR_MIN_VLEN32, VLMUL_FOR_MIN_VLEN64,                \
 		    RATIO_FOR_MIN_VLEN64, VLMUL_FOR_MIN_VLEN128,               \
@@ -1268,6 +1267,8 @@ struct mode_vtype_group
   vlmul_for_for_vlen128[MODE##mode] = VLMUL_FOR_MIN_VLEN128;                   \
   ratio_for_for_vlen128[MODE##mode] = RATIO_FOR_MIN_VLEN128;
 #include "riscv-vector-switch.def"
+#undef ENTRY
+#undef TUPLE_ENTRY
   }
 };

[gcc(refs/vendors/riscv/heads/gcc-13-with-riscv-opts)] RISC-V: Remove duplicate `#include "riscv-vector-switch.def"`

[Jeff Law]

https://gcc.gnu.org/g:a1acd446db7442525351f7e4c730393e03bc9f46

commit a1acd446db7442525351f7e4c730393e03bc9f46
Author: Lehua Ding <lehua.ding@rivai.ai>
Date:   Tue Jun 13 18:59:09 2023 +0800

    RISC-V: Remove duplicate `#include "riscv-vector-switch.def"`
    
    Hi,
    
    This patch remove the duplicate `#include "riscv-vector-switch.def"` statement
    and add #undef for ENTRY and TUPLE_ENTRY macros later.
    
    Best,
    Lehua
    
    gcc/ChangeLog:
    
            * config/riscv/riscv-v.cc (struct mode_vtype_group): Remove duplicate
            #include.
            (ENTRY): Undef.
            (TUPLE_ENTRY): Undef.

Diff:
---
 gcc/config/riscv/riscv-v.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcc/config/riscv/riscv-v.cc b/gcc/config/riscv/riscv-v.cc
index d797326d736..e07d5c2901a 100644
--- a/gcc/config/riscv/riscv-v.cc
+++ b/gcc/config/riscv/riscv-v.cc
@@ -1254,7 +1254,6 @@ struct mode_vtype_group
   ratio_for_min_vlen64[MODE##mode] = RATIO_FOR_MIN_VLEN64;                     \
   vlmul_for_for_vlen128[MODE##mode] = VLMUL_FOR_MIN_VLEN128;                   \
   ratio_for_for_vlen128[MODE##mode] = RATIO_FOR_MIN_VLEN128;
-#include "riscv-vector-switch.def"
 #define TUPLE_ENTRY(MODE, REQUIREMENT, SUBPART_MODE, NF, VLMUL_FOR_MIN_VLEN32, \
 		    RATIO_FOR_MIN_VLEN32, VLMUL_FOR_MIN_VLEN64,                \
 		    RATIO_FOR_MIN_VLEN64, VLMUL_FOR_MIN_VLEN128,               \
@@ -1268,6 +1267,8 @@ struct mode_vtype_group
   vlmul_for_for_vlen128[MODE##mode] = VLMUL_FOR_MIN_VLEN128;                   \
   ratio_for_for_vlen128[MODE##mode] = RATIO_FOR_MIN_VLEN128;
 #include "riscv-vector-switch.def"
+#undef ENTRY
+#undef TUPLE_ENTRY
   }
 };