From: Eric Botcazou Date: Tue, 30 Jun 2015 11:05:35 +0000 (+0000) Subject: leon.md (leon_load): Enable for all LEON variants if -mfix-ut699 is not specified. X-Git-Tag: releases/gcc-4.9.4~728 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f343c83e12b22628b67763ff53f0956ea5da3399;p=thirdparty%2Fgcc.git leon.md (leon_load): Enable for all LEON variants if -mfix-ut699 is not specified. * config/sparc/leon.md (leon_load): Enable for all LEON variants if -mfix-ut699 is not specified. (leon3_load): Rename into... (ut699_load): ...this. Enable for all LEON variants if -mfix-ut699 is specified. From-SVN: r225176 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2eaddf52d75f..2b921c5b1601 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2015-06-30 Eric Botcazou + + * config/sparc/leon.md (leon_load): Enable for all LEON variants if + -mfix-ut699 is not specified. + (leon3_load): Rename into... + (ut699_load): ...this. Enable for all LEON variants if -mfix-ut699 + is specified. + 2015-06-28 Kaz Kojima Backport from mainline diff --git a/gcc/config/sparc/leon.md b/gcc/config/sparc/leon.md index ad22e3b592d8..52bd978ef912 100644 --- a/gcc/config/sparc/leon.md +++ b/gcc/config/sparc/leon.md @@ -24,12 +24,14 @@ (define_cpu_unit "leon_memory" "leon") (define_insn_reservation "leon_load" 1 - (and (eq_attr "cpu" "leon") (eq_attr "type" "load,sload")) + (and (eq_attr "cpu" "leon,leon3,leon3v7") + (and (eq_attr "fix_ut699" "false") (eq_attr "type" "load,sload"))) "leon_memory") ;; Use a double reservation to work around the load pipeline hazard on UT699. -(define_insn_reservation "leon3_load" 1 - (and (eq_attr "cpu" "leon3,leon3v7") (eq_attr "type" "load,sload")) +(define_insn_reservation "ut699_load" 1 + (and (eq_attr "cpu" "leon,leon3,leon3v7") + (and (eq_attr "fix_ut699" "true") (eq_attr "type" "load,sload"))) "leon_memory*2") (define_insn_reservation "leon_store" 2