Skip to content

R
riscv-gcc-1
Commit 7c1583bd by Kito Cheng Committed by Chung-Ju Wu
Options

[NDS32] Implement e8 pipeline. 

gcc/
	* config.gcc (nds32*-*-*): Check that e8 is valid to --with-cpu.
	* config/nds32/nds32-e8.md: New file.
	* config/nds32/nds32-opts.h (nds32-cpu_type): Add CPU_E8.
	* config/nds32/nds32-pipelines-auxiliary.c: Implementation for e8
	pipeline.
	* config/nds32/nds32-protos.h: More declarations for e8 pipeline.
	* config/nds32/nds32.md (pipeline_model): Add e8.
	* config/nds32/nds32.opt (mcpu): Support e8 pipeline cpus.
	* config/nds32/pipelines.md: Include e8 settings.

Co-Authored-By: Chung-Ju Wu <jasonwucj@gmail.com>

From-SVN: r259220
parent 8fd52141
Showing with 185 additions and 4 deletions
gcc/ChangeLog
2018-04-08 Kito Cheng <kito.cheng@gmail.com>
Chung-Ju Wu <jasonwucj@gmail.com>
* config.gcc (nds32*-*-*): Check that e8 is valid to --with-cpu.
* config/nds32/nds32-e8.md: New file.
* config/nds32/nds32-opts.h (nds32-cpu_type): Add CPU_E8.
* config/nds32/nds32-pipelines-auxiliary.c: Implementation for e8
pipeline.
* config/nds32/nds32-protos.h: More declarations for e8 pipeline.
* config/nds32/nds32.md (pipeline_model): Add e8.
* config/nds32/nds32.opt (mcpu): Support e8 pipeline cpus.
* config/nds32/pipelines.md: Include e8 settings.
2018-04-08 Kito Cheng <kito.cheng@gmail.com>
Chung-Ju Wu <jasonwucj@gmail.com>
* config.gcc (nds32*-*-*): Check that n6/n8/s8 are valid to --with-cpu.
* config/nds32/nds32-n8.md: New file.
* config/nds32/nds32-opts.h (nds32_cpu_type): Add CPU_N6 and CPU_N8.
......
gcc/config.gcc
......@@ -4315,11 +4315,11 @@ case "${target}" in
"")
with_cpu=n9
;;
n6 | n8 | s8 | n9)
n6 | n8 | e8 | s8 | n9)
# OK
;;
*)
echo "Cannot accept --with-cpu=$with_cpu, available values are: n6 n8 s8 n9" 1>&2
echo "Cannot accept --with-cpu=$with_cpu, available values are: n6 n8 e8 s8 n9" 1>&2
exit 1
;;
esac
......
gcc/config/nds32/nds32-opts.h
......@@ -39,6 +39,7 @@ enum nds32_cpu_type
{
CPU_N6,
CPU_N8,
CPU_E8,
CPU_N9,
CPU_SIMPLE
};
......
gcc/config/nds32/nds32-pipelines-auxiliary.c
......@@ -446,6 +446,42 @@ n8_consumed_by_ex_p (rtx_insn *consumer, rtx def_reg)
}
/* Check the dependency between the producer defining DEF_REG and CONSUMER
requiring input operand at AG (II). */
bool
e8_consumed_by_addr_in_p (rtx_insn *consumer, rtx def_reg)
{
return n8_consumed_by_addr_in_p (consumer, def_reg);
}
/* Check the dependency between the producer defining DEF_REG and CONSUMER
requiring input operand at EX. */
bool
e8_consumed_by_ex_p (rtx_insn *consumer, rtx def_reg)
{
rtx use_rtx;
switch (get_attr_type (consumer))
{
case TYPE_ALU:
case TYPE_STORE:
use_rtx = SET_SRC (PATTERN (consumer));
break;
case TYPE_MUL:
case TYPE_MAC:
case TYPE_DIV:
case TYPE_BRANCH:
case TYPE_STORE_MULTIPLE:
return n8_consumed_by_ex_p (consumer, def_reg);
default:
gcc_unreachable ();
}
return reg_overlap_p (def_reg, use_rtx);
}
/* Check the dependency between the producer defining DEF_REG and CONSUMER
requiring input operand at EX. */
bool
n9_2r1w_consumed_by_ex_dep_p (rtx_insn *consumer, rtx def_reg)
......@@ -762,6 +798,108 @@ nds32_n8_last_load_to_ex_p (rtx_insn *producer, rtx_insn *consumer)
return n8_consumed_by_ex_p (consumer, last_def_reg);
}
/* Guard functions for E8 cores. */
bool
nds32_e8_load_to_ii_p (rtx_insn *producer, rtx_insn *consumer)
{
rtx def_reg = SET_DEST (PATTERN (producer));
return e8_consumed_by_addr_in_p (consumer, def_reg);
}
bool
nds32_e8_load_to_ex_p (rtx_insn *producer, rtx_insn *consumer)
{
rtx def_reg = SET_DEST (PATTERN (producer));
return e8_consumed_by_ex_p (consumer, def_reg);
}
bool
nds32_e8_ex_to_ii_p (rtx_insn *producer, rtx_insn *consumer)
{
rtx def_reg;
switch (get_attr_type (producer))
{
case TYPE_ALU:
/* No data hazards if AGEN's input is produced by MOVI or SETHI. */
if (GET_CODE (PATTERN (producer)) == SET)
{
rtx dest = SET_DEST (PATTERN (producer));
rtx src = SET_SRC (PATTERN (producer));
if ((REG_P (dest) || GET_CODE (dest) == SUBREG)
&& (GET_CODE (src) == CONST_INT || GET_CODE (src) == HIGH))
return false;
}
def_reg = SET_DEST (PATTERN (producer));
break;
case TYPE_MUL:
case TYPE_MAC:
def_reg = SET_DEST (PATTERN (producer));
break;
case TYPE_DIV:
if (INSN_CODE (producer) == CODE_FOR_divmodsi4
|| INSN_CODE (producer) == CODE_FOR_udivmodsi4)
{
rtx def_reg1 = SET_DEST (parallel_element (producer, 0));
rtx def_reg2 = SET_DEST (parallel_element (producer, 1));
return (e8_consumed_by_addr_in_p (consumer, def_reg1)
|| e8_consumed_by_addr_in_p (consumer, def_reg2));
}
def_reg = SET_DEST (PATTERN (producer));
break;
case TYPE_LOAD:
case TYPE_STORE:
case TYPE_LOAD_MULTIPLE:
case TYPE_STORE_MULTIPLE:
if (!post_update_insn_p (producer))
return false;
def_reg = extract_base_reg (producer);
break;
default:
gcc_unreachable ();
}
return e8_consumed_by_addr_in_p (consumer, def_reg);
}
bool
nds32_e8_last_load_to_ii_p (rtx_insn *producer, rtx_insn *consumer)
{
rtx last_def_reg = extract_nth_access_reg (producer, -1);
if (last_def_reg == NULL_RTX)
return false;
gcc_assert (REG_P (last_def_reg) || GET_CODE (last_def_reg) == SUBREG);
return e8_consumed_by_addr_in_p (consumer, last_def_reg);
}
bool
nds32_e8_last_load_to_ex_p (rtx_insn *producer, rtx_insn *consumer)
{
rtx last_def_reg = extract_nth_access_reg (producer, -1);
if (last_def_reg == NULL_RTX)
return false;
gcc_assert (REG_P (last_def_reg) || GET_CODE (last_def_reg) == SUBREG);
return e8_consumed_by_ex_p (consumer, last_def_reg);
}
/* Guard functions for N9 cores. */
/* Check dependencies from MM to EX. */
......
gcc/config/nds32/nds32-protos.h
......@@ -107,6 +107,12 @@ extern bool nds32_n8_last_load_to_ii_p (rtx_insn *, rtx_insn *);
extern bool nds32_n8_last_load_two_to_ii_p (rtx_insn *, rtx_insn *);
extern bool nds32_n8_last_load_to_ex_p (rtx_insn *, rtx_insn *);
extern bool nds32_e8_load_to_ii_p (rtx_insn *, rtx_insn *);
extern bool nds32_e8_load_to_ex_p (rtx_insn *, rtx_insn *);
extern bool nds32_e8_ex_to_ii_p (rtx_insn *, rtx_insn *);
extern bool nds32_e8_last_load_to_ii_p (rtx_insn *, rtx_insn *);
extern bool nds32_e8_last_load_to_ex_p (rtx_insn *, rtx_insn *);
extern bool nds32_n9_2r1w_mm_to_ex_p (rtx_insn *, rtx_insn *);
extern bool nds32_n9_3r2w_mm_to_ex_p (rtx_insn *, rtx_insn *);
extern bool nds32_n9_last_load_to_ex_p (rtx_insn *, rtx_insn *);
......
gcc/config/nds32/nds32.md
......@@ -56,9 +56,10 @@
;; ------------------------------------------------------------------------
;; CPU pipeline model.
(define_attr "pipeline_model" "n8,n9,simple"
(define_attr "pipeline_model" "n8,e8,n9,simple"
(const
(cond [(match_test "nds32_cpu_option == CPU_N6 || nds32_cpu_option == CPU_N8") (const_string "n8")
(cond [(match_test "nds32_cpu_option == CPU_E8") (const_string "e8")
(match_test "nds32_cpu_option == CPU_N6 || nds32_cpu_option == CPU_N8") (const_string "n8")
(match_test "nds32_cpu_option == CPU_N9") (const_string "n9")
(match_test "nds32_cpu_option == CPU_SIMPLE") (const_string "simple")]
(const_string "n9"))))
......
gcc/config/nds32/nds32.opt
......@@ -199,6 +199,21 @@ EnumValue
Enum(nds32_cpu_type) String(s801) Value(CPU_N8)
EnumValue
Enum(nds32_cpu_type) String(e8) Value(CPU_E8)
EnumValue
Enum(nds32_cpu_type) String(e801) Value(CPU_E8)
EnumValue
Enum(nds32_cpu_type) String(n820) Value(CPU_E8)
EnumValue
Enum(nds32_cpu_type) String(s830) Value(CPU_E8)
EnumValue
Enum(nds32_cpu_type) String(e830) Value(CPU_E8)
EnumValue
Enum(nds32_cpu_type) String(n9) Value(CPU_N9)
EnumValue
......
gcc/config/nds32/pipelines.md
......@@ -23,6 +23,13 @@
;; ------------------------------------------------------------------------
(include "nds32-n8.md")
;; ------------------------------------------------------------------------
;; Include E8 pipeline settings.
;; ------------------------------------------------------------------------
(include "nds32-e8.md")
;; ------------------------------------------------------------------------
;; Include N9/N10 pipeline settings.
;; ------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment