From 71b75290bf2ade9a4022bad93dc80bfb77f87f40 Mon Sep 17 00:00:00 2001 From: "Pavel V. Shatov (Meister)" Date: Mon, 10 Jul 2017 15:31:25 +0300 Subject: * made separate file for low-level settings * turned crazy triple multiplier array into one array with input mux --- src/rtl/pe/modexpa7_adder32.v | 2 +- src/rtl/pe/modexpa7_lowlevel_settings.v | 15 --------------- src/rtl/pe/modexpa7_primitive_switch.v | 16 ++++++++++++++++ src/rtl/pe/modexpa7_subtractor32.v | 2 +- src/rtl/pe/modexpa7_systolic_pe.v | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-) delete mode 100644 src/rtl/pe/modexpa7_lowlevel_settings.v create mode 100644 src/rtl/pe/modexpa7_primitive_switch.v (limited to 'src/rtl/pe') diff --git a/src/rtl/pe/modexpa7_adder32.v b/src/rtl/pe/modexpa7_adder32.v index ad296b1..04f8a18 100644 --- a/src/rtl/pe/modexpa7_adder32.v +++ b/src/rtl/pe/modexpa7_adder32.v @@ -51,7 +51,7 @@ module modexpa7_adder32 // // Include Primitive Selector // - `include "modexpa7_lowlevel_settings.v" + `include "modexpa7_primitive_switch.v" // diff --git a/src/rtl/pe/modexpa7_lowlevel_settings.v b/src/rtl/pe/modexpa7_lowlevel_settings.v deleted file mode 100644 index 93f5f34..0000000 --- a/src/rtl/pe/modexpa7_lowlevel_settings.v +++ /dev/null @@ -1,15 +0,0 @@ -//`define USE_VENDOR_PRIMITIVES - -`ifdef USE_VENDOR_PRIMITIVES - -`define ADDER32_PRIMITIVE adder32_artix7 -`define SUBTRACTOR32_PRIMITIVE subtractor32_artix7 -`define SYSTOLIC_PE_PRIMITIVE systolic_pe_artix7 - -`else - -`define ADDER32_PRIMITIVE adder32_generic -`define SUBTRACTOR32_PRIMITIVE subtractor32_generic -`define SYSTOLIC_PE_PRIMITIVE systolic_pe_generic - -`endif diff --git a/src/rtl/pe/modexpa7_primitive_switch.v b/src/rtl/pe/modexpa7_primitive_switch.v new file mode 100644 index 0000000..d38069b --- /dev/null +++ b/src/rtl/pe/modexpa7_primitive_switch.v @@ -0,0 +1,16 @@ +//`define USE_VENDOR_PRIMITIVES + +`ifdef USE_VENDOR_PRIMITIVES + +`define ADDER32_PRIMITIVE adder32_artix7 +`define SUBTRACTOR32_PRIMITIVE subtractor32_artix7 +`define SYSTOLIC_PE_PRIMITIVE systolic_pe_artix7 + +`else + +`define ADDER32_PRIMITIVE adder32_generic +`define SUBTRACTOR32_PRIMITIVE subtractor32_generic +`define SYSTOLIC_PE_PRIMITIVE systolic_pe_generic + + +`endif diff --git a/src/rtl/pe/modexpa7_subtractor32.v b/src/rtl/pe/modexpa7_subtractor32.v index 75b9c13..a43d670 100644 --- a/src/rtl/pe/modexpa7_subtractor32.v +++ b/src/rtl/pe/modexpa7_subtractor32.v @@ -51,7 +51,7 @@ module modexpa7_subtractor32 // // Include Primitive Selector // - `include "modexpa7_lowlevel_settings.v" + `include "modexpa7_primitive_switch.v" // diff --git a/src/rtl/pe/modexpa7_systolic_pe.v b/src/rtl/pe/modexpa7_systolic_pe.v index 22e6874..b284134 100644 --- a/src/rtl/pe/modexpa7_systolic_pe.v +++ b/src/rtl/pe/modexpa7_systolic_pe.v @@ -51,7 +51,7 @@ module modexpa7_systolic_pe // // Include Primitive Selector // - `include "modexpa7_lowlevel_settings.v" + `include "modexpa7_primitive_switch.v" // -- cgit v1.2.3