https://gcc.gnu.org/g:95305c800b1b3263534fdf67b63609772ecbb78d
commit r15-5174-g95305c800b1b3263534fdf67b63609772ecbb78d Author: Wilco Dijkstra <wilco.dijks...@arm.com> Date: Mon Oct 7 15:42:49 2024 +0000 AArch64: Remove duplicated addr_cost tables Remove duplicated addr_cost tables - use generic_armv9_a_addrcost_table for Armv9-a cores and generic_armv8_a_addrcost_table for recent Armv8-a cores. No changes in generated code. gcc/ChangeLog: * config/aarch64/tuning_models/cortexx925.h (cortexx925_addrcost_table): Remove. * config/aarch64/tuning_models/neoversen1.h: Use generic_armv8_a_addrcost_table. * config/aarch64/tuning_models/neoversen2.h (neoversen2_addrcost_table): Remove. * config/aarch64/tuning_models/neoversen3.h (neoversen3_addrcost_table): Remove. * config/aarch64/tuning_models/neoversev2.h (neoversev2_addrcost_table): Remove. * config/aarch64/tuning_models/neoversev3.h (neoversev3_addrcost_table): Remove. * config/aarch64/tuning_models/neoversev3ae.h (neoversev3ae_addrcost_table): Remove. Diff: --- gcc/config/aarch64/tuning_models/cortexx925.h | 20 +------------------- gcc/config/aarch64/tuning_models/neoversen1.h | 2 +- gcc/config/aarch64/tuning_models/neoversen2.h | 20 +------------------- gcc/config/aarch64/tuning_models/neoversen3.h | 20 +------------------- gcc/config/aarch64/tuning_models/neoversev2.h | 20 +------------------- gcc/config/aarch64/tuning_models/neoversev3.h | 20 +------------------- gcc/config/aarch64/tuning_models/neoversev3ae.h | 20 +------------------- 7 files changed, 7 insertions(+), 115 deletions(-) diff --git a/gcc/config/aarch64/tuning_models/cortexx925.h b/gcc/config/aarch64/tuning_models/cortexx925.h index 89aa35366993..eb9b89984b04 100644 --- a/gcc/config/aarch64/tuning_models/cortexx925.h +++ b/gcc/config/aarch64/tuning_models/cortexx925.h @@ -22,24 +22,6 @@ #include "generic.h" -static const struct cpu_addrcost_table cortexx925_addrcost_table = -{ - { - 1, /* hi */ - 0, /* si */ - 0, /* di */ - 1, /* ti */ - }, - 0, /* pre_modify */ - 0, /* post_modify */ - 2, /* post_modify_ld3_st3 */ - 2, /* post_modify_ld4_st4 */ - 0, /* register_offset */ - 0, /* register_sextend */ - 0, /* register_zextend */ - 0 /* imm_offset */ -}; - static const struct cpu_regmove_cost cortexx925_regmove_cost = { 3, /* GP2GP */ @@ -209,7 +191,7 @@ static const struct cpu_vector_cost cortexx925_vector_cost = static const struct tune_params cortexx925_tunings = { &cortexa76_extra_costs, - &cortexx925_addrcost_table, + &generic_armv9_a_addrcost_table, &cortexx925_regmove_cost, &cortexx925_vector_cost, &generic_branch_cost, diff --git a/gcc/config/aarch64/tuning_models/neoversen1.h b/gcc/config/aarch64/tuning_models/neoversen1.h index a09b684fcdb0..82def6b2736d 100644 --- a/gcc/config/aarch64/tuning_models/neoversen1.h +++ b/gcc/config/aarch64/tuning_models/neoversen1.h @@ -25,7 +25,7 @@ static const struct tune_params neoversen1_tunings = { &cortexa76_extra_costs, - &generic_addrcost_table, + &generic_armv8_a_addrcost_table, &generic_regmove_cost, &cortexa57_vector_cost, &generic_branch_cost, diff --git a/gcc/config/aarch64/tuning_models/neoversen2.h b/gcc/config/aarch64/tuning_models/neoversen2.h index dd175b75557b..18199ac206c6 100644 --- a/gcc/config/aarch64/tuning_models/neoversen2.h +++ b/gcc/config/aarch64/tuning_models/neoversen2.h @@ -22,24 +22,6 @@ #include "generic.h" -static const struct cpu_addrcost_table neoversen2_addrcost_table = -{ - { - 1, /* hi */ - 0, /* si */ - 0, /* di */ - 1, /* ti */ - }, - 0, /* pre_modify */ - 0, /* post_modify */ - 2, /* post_modify_ld3_st3 */ - 2, /* post_modify_ld4_st4 */ - 0, /* register_offset */ - 0, /* register_sextend */ - 0, /* register_zextend */ - 0 /* imm_offset */ -}; - static const struct cpu_regmove_cost neoversen2_regmove_cost = { 1, /* GP2GP */ @@ -209,7 +191,7 @@ static const struct cpu_vector_cost neoversen2_vector_cost = static const struct tune_params neoversen2_tunings = { &cortexa76_extra_costs, - &neoversen2_addrcost_table, + &generic_armv9_a_addrcost_table, &neoversen2_regmove_cost, &neoversen2_vector_cost, &generic_branch_cost, diff --git a/gcc/config/aarch64/tuning_models/neoversen3.h b/gcc/config/aarch64/tuning_models/neoversen3.h index e510c8f09f78..4da85cfac0d1 100644 --- a/gcc/config/aarch64/tuning_models/neoversen3.h +++ b/gcc/config/aarch64/tuning_models/neoversen3.h @@ -22,24 +22,6 @@ #include "generic.h" -static const struct cpu_addrcost_table neoversen3_addrcost_table = -{ - { - 1, /* hi */ - 0, /* si */ - 0, /* di */ - 1, /* ti */ - }, - 0, /* pre_modify */ - 0, /* post_modify */ - 2, /* post_modify_ld3_st3 */ - 2, /* post_modify_ld4_st4 */ - 0, /* register_offset */ - 0, /* register_sextend */ - 0, /* register_zextend */ - 0 /* imm_offset */ -}; - static const struct cpu_regmove_cost neoversen3_regmove_cost = { 3, /* GP2GP */ @@ -209,7 +191,7 @@ static const struct cpu_vector_cost neoversen3_vector_cost = static const struct tune_params neoversen3_tunings = { &cortexa76_extra_costs, - &neoversen3_addrcost_table, + &generic_armv9_a_addrcost_table, &neoversen3_regmove_cost, &neoversen3_vector_cost, &generic_branch_cost, diff --git a/gcc/config/aarch64/tuning_models/neoversev2.h b/gcc/config/aarch64/tuning_models/neoversev2.h index b2aca79b9cef..1369de73991c 100644 --- a/gcc/config/aarch64/tuning_models/neoversev2.h +++ b/gcc/config/aarch64/tuning_models/neoversev2.h @@ -22,24 +22,6 @@ #include "generic.h" -static const struct cpu_addrcost_table neoversev2_addrcost_table = -{ - { - 1, /* hi */ - 0, /* si */ - 0, /* di */ - 1, /* ti */ - }, - 0, /* pre_modify */ - 0, /* post_modify */ - 2, /* post_modify_ld3_st3 */ - 2, /* post_modify_ld4_st4 */ - 0, /* register_offset */ - 0, /* register_sextend */ - 0, /* register_zextend */ - 0 /* imm_offset */ -}; - static const struct cpu_regmove_cost neoversev2_regmove_cost = { 1, /* GP2GP */ @@ -222,7 +204,7 @@ static const cpu_prefetch_tune neoversev2_prefetch_tune = static const struct tune_params neoversev2_tunings = { &cortexa76_extra_costs, - &neoversev2_addrcost_table, + &generic_armv9_a_addrcost_table, &neoversev2_regmove_cost, &neoversev2_vector_cost, &generic_branch_cost, diff --git a/gcc/config/aarch64/tuning_models/neoversev3.h b/gcc/config/aarch64/tuning_models/neoversev3.h index 84415ae65835..d8c82255378c 100644 --- a/gcc/config/aarch64/tuning_models/neoversev3.h +++ b/gcc/config/aarch64/tuning_models/neoversev3.h @@ -22,24 +22,6 @@ #include "generic.h" -static const struct cpu_addrcost_table neoversev3_addrcost_table = -{ - { - 1, /* hi */ - 0, /* si */ - 0, /* di */ - 1, /* ti */ - }, - 0, /* pre_modify */ - 0, /* post_modify */ - 2, /* post_modify_ld3_st3 */ - 2, /* post_modify_ld4_st4 */ - 0, /* register_offset */ - 0, /* register_sextend */ - 0, /* register_zextend */ - 0 /* imm_offset */ -}; - static const struct cpu_regmove_cost neoversev3_regmove_cost = { 3, /* GP2GP */ @@ -209,7 +191,7 @@ static const struct cpu_vector_cost neoversev3_vector_cost = static const struct tune_params neoversev3_tunings = { &cortexa76_extra_costs, - &neoversev3_addrcost_table, + &generic_armv9_a_addrcost_table, &neoversev3_regmove_cost, &neoversev3_vector_cost, &generic_branch_cost, diff --git a/gcc/config/aarch64/tuning_models/neoversev3ae.h b/gcc/config/aarch64/tuning_models/neoversev3ae.h index 3cb92fde54bf..7f050501ede7 100644 --- a/gcc/config/aarch64/tuning_models/neoversev3ae.h +++ b/gcc/config/aarch64/tuning_models/neoversev3ae.h @@ -22,24 +22,6 @@ #include "generic.h" -static const struct cpu_addrcost_table neoversev3ae_addrcost_table = -{ - { - 1, /* hi */ - 0, /* si */ - 0, /* di */ - 1, /* ti */ - }, - 0, /* pre_modify */ - 0, /* post_modify */ - 2, /* post_modify_ld3_st3 */ - 2, /* post_modify_ld4_st4 */ - 0, /* register_offset */ - 0, /* register_sextend */ - 0, /* register_zextend */ - 0 /* imm_offset */ -}; - static const struct cpu_regmove_cost neoversev3ae_regmove_cost = { 3, /* GP2GP */ @@ -209,7 +191,7 @@ static const struct cpu_vector_cost neoversev3ae_vector_cost = static const struct tune_params neoversev3ae_tunings = { &cortexa76_extra_costs, - &neoversev3ae_addrcost_table, + &generic_armv9_a_addrcost_table, &neoversev3ae_regmove_cost, &neoversev3ae_vector_cost, &generic_branch_cost,