Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1067 from antmicro/fix-microwatt-synthesis 

Fix microwatt synthesis
This commit is contained in:
enjoy-digital 2021-10-19 14:43:11 +02:00 committed by GitHub
parent 4335e305f7 5b166b3aa4
commit 2a97b6a1c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
litex/soc/cores/cpu/microwatt/core.py
View File

@ -86,7 +86,7 @@ class Microwatt(CPU):
i_wishbone_insn_ack = ibus.ack, i_wishbone_insn_ack = ibus.ack,
i_wishbone_insn_stall = ibus.cyc & ~ibus.ack, # No burst support i_wishbone_insn_stall = ibus.cyc & ~ibus.ack, # No burst support
o_wishbone_insn_adr = Cat(Signal(3), ibus.adr), o_wishbone_insn_adr = ibus.adr,
o_wishbone_insn_dat_w = ibus.dat_w, o_wishbone_insn_dat_w = ibus.dat_w,
o_wishbone_insn_cyc = ibus.cyc, o_wishbone_insn_cyc = ibus.cyc,
o_wishbone_insn_stb = ibus.stb, o_wishbone_insn_stb = ibus.stb,
@ -98,7 +98,7 @@ class Microwatt(CPU):
i_wishbone_data_ack = dbus.ack, i_wishbone_data_ack = dbus.ack,
i_wishbone_data_stall = dbus.cyc & ~dbus.ack, # No burst support i_wishbone_data_stall = dbus.cyc & ~dbus.ack, # No burst support
o_wishbone_data_adr = Cat(Signal(3), dbus.adr), o_wishbone_data_adr = dbus.adr,
o_wishbone_data_dat_w = dbus.dat_w, o_wishbone_data_dat_w = dbus.dat_w,
o_wishbone_data_cyc = dbus.cyc, o_wishbone_data_cyc = dbus.cyc,
o_wishbone_data_stb = dbus.stb, o_wishbone_data_stb = dbus.stb,
@ -147,6 +147,7 @@ class Microwatt(CPU):
"utils.vhdl", "utils.vhdl",
"common.vhdl", "common.vhdl",
"helpers.vhdl", "helpers.vhdl",
"nonrandom.vhdl",
# Fetch. # Fetch.
"fetch1.vhdl", "fetch1.vhdl",
@ -160,8 +161,6 @@ class Microwatt(CPU):
# Decode. # Decode.
"insn_helpers.vhdl", "insn_helpers.vhdl",
"decode1.vhdl", "decode1.vhdl",
"gpr_hazard.vhdl",
"cr_hazard.vhdl",
"control.vhdl", "control.vhdl",
"decode2.vhdl", "decode2.vhdl",
@ -184,6 +183,12 @@ class Microwatt(CPU):
"multiply.vhdl", "multiply.vhdl",
"divider.vhdl", "divider.vhdl",
# FPU.
"fpu.vhdl",
# PMU.
"pmu.vhdl",
# Writeback. # Writeback.
"writeback.vhdl", "writeback.vhdl",

14
litex/soc/cores/cpu/microwatt/microwatt_wrapper.vhdl
View File

@ -16,7 +16,8 @@ use work.wishbone_types.all;
entity microwatt_wrapper is entity microwatt_wrapper is
generic ( generic (
SIM : boolean := false; SIM : boolean := false;
DISABLE_FLATTEN : boolean := false DISABLE_FLATTEN : boolean := false;
HAS_FPU : boolean := false
); );
port ( port (
clk : in std_logic; clk : in std_logic;
@ -26,7 +27,7 @@ entity microwatt_wrapper is
wishbone_insn_ack : in std_ulogic; wishbone_insn_ack : in std_ulogic;
wishbone_insn_stall : in std_ulogic; wishbone_insn_stall : in std_ulogic;
wishbone_insn_adr : out std_ulogic_vector(31 downto 0); wishbone_insn_adr : out std_ulogic_vector(28 downto 0);
wishbone_insn_dat_w : out std_ulogic_vector(63 downto 0); wishbone_insn_dat_w : out std_ulogic_vector(63 downto 0);
wishbone_insn_cyc : out std_ulogic; wishbone_insn_cyc : out std_ulogic;
wishbone_insn_stb : out std_ulogic; wishbone_insn_stb : out std_ulogic;
@ -37,13 +38,15 @@ entity microwatt_wrapper is
wishbone_data_ack : in std_ulogic; wishbone_data_ack : in std_ulogic;
wishbone_data_stall : in std_ulogic; wishbone_data_stall : in std_ulogic;
wishbone_data_adr : out std_ulogic_vector(31 downto 0); wishbone_data_adr : out std_ulogic_vector(28 downto 0);
wishbone_data_dat_w : out std_ulogic_vector(63 downto 0); wishbone_data_dat_w : out std_ulogic_vector(63 downto 0);
wishbone_data_cyc : out std_ulogic; wishbone_data_cyc : out std_ulogic;
wishbone_data_stb : out std_ulogic; wishbone_data_stb : out std_ulogic;
wishbone_data_sel : out std_ulogic_vector(7 downto 0); wishbone_data_sel : out std_ulogic_vector(7 downto 0);
wishbone_data_we : out std_ulogic; wishbone_data_we : out std_ulogic;
wb_snoop_in : in wishbone_master_out;
dmi_addr : in std_ulogic_vector(3 downto 0); dmi_addr : in std_ulogic_vector(3 downto 0);
dmi_din : in std_ulogic_vector(63 downto 0); dmi_din : in std_ulogic_vector(63 downto 0);
dmi_dout : out std_ulogic_vector(63 downto 0); dmi_dout : out std_ulogic_vector(63 downto 0);
@ -94,7 +97,8 @@ begin
microwatt_core : entity work.core microwatt_core : entity work.core
generic map ( generic map (
SIM => SIM, SIM => SIM,
DISABLE_FLATTEN => DISABLE_FLATTEN DISABLE_FLATTEN => DISABLE_FLATTEN,
HAS_FPU => HAS_FPU
) )
port map ( port map (
clk => clk, clk => clk,
@ -108,6 +112,8 @@ begin
wishbone_data_in => wishbone_data_in, wishbone_data_in => wishbone_data_in,
wishbone_data_out => wishbone_data_out, wishbone_data_out => wishbone_data_out,
wb_snoop_in => wb_snoop_in,
dmi_addr => dmi_addr, dmi_addr => dmi_addr,
dmi_din => dmi_din, dmi_din => dmi_din,
dmi_dout => dmi_dout, dmi_dout => dmi_dout,