Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Import emu-library #1

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Import emu-library #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a525981
Update for Vivado 2016
sibanez12 Apr 6, 2018
35c2262
Update for Vivado 2016
Apr 6, 2018
e82341c
Merge branch 'master' of https://github.com/marktdeng/emu-live
Apr 6, 2018
073e0dd
Import emu-library
marktdeng May 27, 2018
3c58da4
Add Kiwi cvgates
marktdeng May 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ out/Nat.dll: $(EMU_TARGETS) Nat/*.cs Nat/EmuUtil/*.cs Nat/Nat.sln Nat/Nat.csproj
cp Nat/bin/Kiwi/EmuUtil.dll out/

out/%.dll: %.cs $(EMU_TARGETS)
time $(CSC) $(CSC_FLAGS) /target:library $(patsubst %, /r:%, $(EMU_TARGETS)) /r:$(KIWIDLL) -o $@ $<
time $(CSC) $(CSC_FLAGS) /target:library $(patsubst %, /r:%, $(EMU_TARGETS)) /r:$(KIWIDLL) -out:$@ $<

out/Nat.v: out/Nat.dll $(EMU_TARGETS)
time $(KIWIC) $^ out/EmuUtil.dll -bevelab-default-pause-mode=hard -vnl-resets=synchronous -vnl-roundtrip=disable -res2-loadstore-port-count=0 -restructure2=disable -conerefine=disable -vnl $@
Expand Down
12 changes: 6 additions & 6 deletions Makefile.emu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
include Makefile.base

$(Memory_TGT): $(Memory_SRC)
$(CSC) $(CSC_FLAGS) /target:library /r:$(KIWIDLL) -o $@ $<
$(CSC) $(CSC_FLAGS) /target:library /r:$(KIWIDLL) -out:$@ $<
$(CAM_TGT): $(CAM_SRC) $(Memory_TGT) $(RXTX_TGT)
$(CSC) $(CSC_FLAGS) /target:library /r:$(KIWIDLL) /r:$(Memory_TGT) /r:$(RXTX_TGT) -o $@ $<
$(EMU_TGT): $(EMU_SRC)
$(CSC) $(CSC_FLAGS) /target:library /r:$(KIWIDLL) -o $@ $<
$(CSC) $(CSC_FLAGS) /target:library /r:$(KIWIDLL) -out:$@ $<
$(NF_TGT): $(NF_SRC) $(EMU_TGT)
$(CSC) $(CSC_FLAGS) /target:library /r:$(KIWIDLL) -o $@ $<
$(CSC) $(CSC_FLAGS) /target:library /r:$(KIWIDLL) -out:$@ $<
$(P_TGT): $(P_SRC) $(EMU_TGT)
$(CSC) $(CSC_FLAGS) /target:library /r:$(KIWIDLL) /r:$(EMU_TGT) -o $@ $<
$(CSC) $(CSC_FLAGS) /target:library /r:$(KIWIDLL) /r:$(EMU_TGT) -out:$@ $<
$(Memcached_TGT): $(Memcached_SRC) $(P_TGT) $(Memory_TGT)
$(CSC) $(CSC_FLAGS) /target:library /r:$(KIWIDLL) /r:$(P_TGT) /r:$(Memory_TGT) -o $@ $<
$(CSC) $(CSC_FLAGS) /target:library /r:$(KIWIDLL) /r:$(P_TGT) /r:$(Memory_TGT) -out:$@ $<
$(RXTX_TGT): $(RXTX_SRC) $(NF_TGT)
$(CSC) $(CSC_FLAGS) /target:library /r:$(KIWIDLL) /r:$(NF_TGT) -o $@ $<
$(CSC) $(CSC_FLAGS) /target:library /r:$(KIWIDLL) /r:$(NF_TGT) -out:$@ $<
26 changes: 16 additions & 10 deletions kiwi_src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ CSC ?= gmcs

ENABLE_THREADS ?= -compose=disable
HIDE_REGS ?= enable
KIWI_FLAGS ?= -bevelab-default-pause-mode=hard -vnl-resets=synchronous -vnl-roundtrip=disable -res2-loadstore-port-count=0 -restructure2=disable -conerefine=$(HIDE_REGS) $(ENABLE_THREADS)
#KIWI_FLAGS ?= -bevelab-default-pause-mode=hard -vnl-resets=synchronous -vnl-roundtrip=disable -res2-loadstore-port-count=0 -restructure2=disable -conerefine=$(HIDE_REGS) $(ENABLE_THREADS)
KIWI_FLAGS ?= -vnl-resets=synchronous -vnl-roundtrip=disable -res2-loadstore-port-count=0 -restructure2=disable -kiwife-dynpoly=disable -conerefine=$(HIDE_REGS) $(ENABLE_THREADS)

# Choose the desired type of design, block design (vb) or verilog based design (bd)
DESIGN_TYPE := vb
Expand Down Expand Up @@ -142,15 +143,15 @@ emu_memcached_ascii_sume emu_memcached_binary_sume emu_reference_switch_sume emu
@echo "Update SUME IP cores library"
@make -C $(LIB_HW_emu_opl)/

emu_reference_switch_lite_sume emu_reference_switch_lite_v2_sume emu_ICMP_echo_sume emu_DNS_server_sume emu_DNS_DBG_sume emu_TCP_pingRA_sume emu_TCP_pingSA_sume: $$(subst _sume,.v,$$@)
emu_reference_switch_lite_sume emu_reference_switch_lite_v2_sume emu_reference_switch_lite_v2_library_sume emu_ICMP_echo_sume emu_DNS_server_sume emu_DNS_DBG_sume emu_TCP_pingRA_sume emu_TCP_pingSA_sume emu_packet_generator_sume: $$(subst _sume,.v,$$@)
@echo "\nKiwi Compilation finished : "$^" "
# Rename the module in the generated verilog file 'emu_*_*_sume' to 'Emu'
@sed -i 's/'.*module.*$(subst _sume,,$@)'/module Emu/' $<
# Copy the Emu to the lib folder of the NetFPGA dir
@echo "Copy $^\t\t-- "$(SUME_FOLDER)/lib/hw/std/cores/"emu_output_port_lookup_v1_0_0/hdl/Emu.v"
@cp -fp $< $(LIB_HW_emu_opl)/hdl/Emu.v
# Copy the correct opl to the lib folder of the NetFPGA
@if [ $@ = "emu_reference_switch_lite_v2_sume" ]; then \
@if [ $@ = "emu_reference_switch_lite_v2_library_sume" ] || [ $@ = "emu_reference_switch_lite_v2_sume" ] || [ $@ = "emu_packet_generator_sume" ]; then \
$(call copy_OPL_to_lib,"emu_output_port_lookup_AXIS256.v"); \
$(call set_clock_freq,200,$(DESIGN_TYPE)); \
else \
Expand All @@ -172,11 +173,16 @@ Nat: Nat.v
cp -f ../netfpga_src/opl_wrapper/emu_output_port_lookup_AXIS64.v $(SUME_FOLDER)/lib/hw/std/cores/emu_output_port_lookup_v1_0_0/hdl/emu_output_port_lookup.v
make -C $(SUME_FOLDER)/lib/hw/std/cores/emu_output_port_lookup_v1_0_0/

%.v: %.dll
$(KIWIC) $< $(KIWI_FLAGS) -vnl $@
%.v: %.dll emu_library.dll
$(KIWIC) $< emu_library.dll $(KIWI_FLAGS) -vnl $@


%.dll: %.cs
$(CSC) /target:library /r:$(KIWIDLL) $<
$(CSC) /target:library /r:$(KIWIDLL) /r:emu_library.dll $<


emu_library.dll:
make -C emu_library


install_sume:
Expand All @@ -196,13 +202,13 @@ install_sume:
if [ "$(DESIGN_TYPE)" = "vb" ]; then \
echo "Create [Verilog Based design, $(DESIGN_TYPE)] $(SUME_FOLDER)/projects/reference_emu/hw"; \
echo "Create [Verilog Based design, $(DESIGN_TYPE)] $(SUME_FOLDER)/projects/reference_emu/sw"; \
cp -Rf $(SUME_FOLDER)/projects/reference_emu/hw_vb/* $(SUME_FOLDER)/projects/reference_emu/hw/; \
cp -Rf $(SUME_FOLDER)/projects/reference_emu/sw_vb/* $(SUME_FOLDER)/projects/reference_emu/sw/; \
cp -Rf $(SUME_FOLDER)/projects/reference_emu/hw_vb/ $(SUME_FOLDER)/projects/reference_emu/hw/; \
cp -Rf $(SUME_FOLDER)/projects/reference_emu/sw_vb/ $(SUME_FOLDER)/projects/reference_emu/sw/; \
else \
echo "Create [Blobk Design, $(DESIGN_TYPE)] $(SUME_FOLDER)/projects/reference_emu/hw"; \
echo "Create [Block Design, $(DESIGN_TYPE)] $(SUME_FOLDER)/projects/reference_emu/sw"; \
cp -Rf $(SUME_FOLDER)/projects/reference_emu/hw_bd/* $(SUME_FOLDER)/projects/reference_emu/hw; \
cp -Rf $(SUME_FOLDER)/projects/reference_emu/sw_bd/* $(SUME_FOLDER)/projects/reference_emu/sw; \
cp -Rf $(SUME_FOLDER)/projects/reference_emu/hw_bd/ $(SUME_FOLDER)/projects/reference_emu/hw; \
cp -Rf $(SUME_FOLDER)/projects/reference_emu/sw_bd/ $(SUME_FOLDER)/projects/reference_emu/sw; \
fi; \
if ! grep -q "emu_output_port_lookup_v1_0_0" $(SUME_FOLDER)/Makefile; then \
echo "Modify the recipe in $(SUME_FOLDER)/Makefile"; \
Expand Down
18 changes: 18 additions & 0 deletions kiwi_src/emu-library/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
SHELL ?= /bin/bash
KIWI ?= $(HPRLS)/kiwipro/kiwic/distro
KIWIDLL ?= $(KIWI)/support/Kiwi.dll

MONO ?= mono
KIWIC ?= $(MONO) $(KIWI)/lib/kiwic.exe
CSC ?= gmcs

ENABLE_THREADS ?= -compose=disable
HIDE_REGS ?= enable
KIWI_FLAGS ?= -bevelab-default-pause-mode=hard -vnl-resets=synchronous -vnl-roundtrip=disable -res2-loadstore-port-count=0 -restructure2=disable -conerefine=$(HIDE_REGS) $(ENABLE_THREADS)

emu_library: *.cs
$(CSC) /target:library /r:$(KIWIDLL) emu_library_*.cs -out:../emu_library.dll

clean:
- rm -f *.dll

268 changes: 268 additions & 0 deletions kiwi_src/emu-library/emu_library_base_class.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,268 @@
// Emu library base class
//
// Copyright 2018 Mark Deng <mtd36@cam.ac.uk>
// All rights reserved
//
// Use of this source code is governed by the Apache 2.0 license; see LICENSE file
//
// Some port instatiations copyright 2016 Salvator Galea <salvator.galea@cl.cam.ac.uk>


using KiwiSystem;

namespace EmuLibrary
{
public class Emu
{
// ----------------
// - I/O PORTS
// ----------------
// These are the ports of the circuit (and will appear as ports in the generated Verilog)
// Slave Stream Ports
[Kiwi.InputWordPort("s_axis_tdata_0")] // s_axis_tdata
protected internal static ulong s_axis_tdata_0; // Data to be received

[Kiwi.InputWordPort("s_axis_tdata_1")] // s_axis_tdata
protected internal static ulong s_axis_tdata_1; // Data to be received

[Kiwi.InputWordPort("s_axis_tdata_2")] // s_axis_tdata
protected internal static ulong s_axis_tdata_2; // Data to be received

[Kiwi.InputWordPort("s_axis_tdata_3")] // s_axis_tdata
protected internal static ulong s_axis_tdata_3; // Data to be received

[Kiwi.InputBitPort("s_axis_tkeep")] // s_axis_tkeep
protected internal static uint s_axis_tkeep; // Offset of valid bytes in the data bus

[Kiwi.InputBitPort("s_axis_tlast")] // s_axis_tlast
protected internal static bool s_axis_tlast; // End of frame indicator

[Kiwi.InputBitPort("s_axis_tvalid")] // s_axis_tvalid
protected internal static bool s_axis_tvalid; // Valid data on the bus - indicator

[Kiwi.OutputBitPort("s_axis_tready")] // s_axis_tready
protected internal static bool s_axis_tready; // Ready to receive data - indicator

[Kiwi.InputWordPort("s_axis_tuser_hi")] // s_axis_tuser_hi
protected internal static ulong s_axis_tuser_hi; // metadata

[Kiwi.InputWordPort("s_axis_tuser_low")] // s_axis_tuser_low
protected internal static ulong s_axis_tuser_low; // metadata

// Master Stream Ports
[Kiwi.OutputWordPort("m_axis_tdata_0")] // m_axis_tdata
protected internal static ulong m_axis_tdata_0; // Data to be sent

[Kiwi.OutputWordPort("m_axis_tdata_1")] // m_axis_tdata
protected internal static ulong m_axis_tdata_1; // Data to be sent

[Kiwi.OutputWordPort("m_axis_tdata_2")] // m_axis_tdata
protected internal static ulong m_axis_tdata_2; // Data to be sent

[Kiwi.OutputWordPort("m_axis_tdata_3")] // m_axis_tdata
protected internal static ulong m_axis_tdata_3; // Data to be sent

[Kiwi.OutputBitPort("m_axis_tkeep")] // m_axis_tkeep
protected internal static uint m_axis_tkeep; // Offset of valid bytes in the data bus

[Kiwi.OutputBitPort("m_axis_tlast")] // m_axis_tlast
protected internal static bool m_axis_tlast; // End of frame indicator

[Kiwi.OutputBitPort("m_axis_tvalid")] // m_axis_tvalid
protected internal static bool m_axis_tvalid; // Valid data on the bus - indicator

[Kiwi.InputBitPort("m_axis_tready")] // m_axis_tready
protected internal static bool m_axis_tready; // Ready to transmit data - indicator

[Kiwi.OutputBitPort("m_axis_tuser_hi")] // m_axis_tuser_hi
protected internal static ulong m_axis_tuser_hi; // metadata

[Kiwi.OutputWordPort("m_axis_tuser_low")] // m_axis_tuser_low
protected internal static ulong m_axis_tuser_low; // metadata

// CAM Memory Ports
// Input Ports
[Kiwi.InputWordPort("cam_busy")] // cam_busy
protected internal static bool cam_busy; // Busy signal from the CAM

[Kiwi.InputBitPort("cam_match")] // cam_match
protected internal static bool cam_match; // Match singal if data has been found

[Kiwi.InputBitPort("cam_match_addr")] // cam_match_addr
protected internal static byte cam_match_addr; // Return address of the matched data

// Output Ports
[Kiwi.OutputWordPort("cam_cmp_din")] // cam_cmp_din
protected internal static ulong cam_cmp_din = ~(ulong) 0x00; // Data to compare against the content of the CAM

[Kiwi.OutputWordPort("cam_din")] // cam_din
protected internal static ulong cam_din = 0x00; // Data to be writen in the CAM

[Kiwi.OutputBitPort("cam_we")] // cam_we
protected internal static bool cam_we = false; // Write enable signal

[Kiwi.OutputBitPort("cam_wr_addr")] // cam_wr_addr
protected internal static byte cam_wr_addr = 0x00; // Address to write data in CAM

// CAM Memory Ports
// Input Ports
[Kiwi.InputBitPort("cam_busy_learn")] // cam_busy
protected internal static bool cam_busy_learn; // Busy signal from the CAM

[Kiwi.InputBitPort("cam_match_learn")] // cam_match
protected internal static bool cam_match_learn; // Match singal if data has been found

[Kiwi.InputBitPort("cam_match_addr_learn")] // cam_match_addr
protected internal static byte cam_match_addr_learn; // Return address of the matched data

// Output Ports
[Kiwi.OutputWordPort("cam_cmp_din_learn")] // cam_cmp_din
protected internal static ulong
cam_cmp_din_learn = ~(ulong) 0x00; // Data to compare against the content of the CAM

[Kiwi.OutputWordPort("cam_din_learn")] // cam_din
protected internal static ulong cam_din_learn = 0x00; // Data to be writen in the CAM

[Kiwi.OutputBitPort("cam_we_learn")] // cam_we
protected internal static bool cam_we_learn = false; // Write enable signal

[Kiwi.OutputBitPort("cam_wr_addr_learn")] // cam_wr_addr
protected internal static byte cam_wr_addr_learn = 0x00; // Address to write data in CAM

// FIFO Ports
[Kiwi.OutputBitPort("fifo_wr_en")] // fifo_wr_we
protected internal static bool fifo_wr_en = false; // Write enable signal

[Kiwi.OutputBitPort("fifo_din")] // fifo_wr_we
protected internal static ulong fifo_din = 0x00;

[Kiwi.OutputBitPort("fifo_rd_en")] // fifo_rd_we
protected internal static bool fifo_rd_en = false; // Read enable signal

[Kiwi.OutputBitPort("fifo_dout")] // fifo_rd_we
protected internal static ulong fifo_dout = 0x00;

[Kiwi.InputBitPort("fifo_full")] // fifo_full
protected internal static bool fifo_full;

[Kiwi.InputBitPort("fifo_empty")] // fifo_empty
protected internal static bool fifo_empty;

// AXI Master Ports
[Kiwi.OutputBitPort("axi_m_axis_tvalid")] // m_axis_tready
protected internal static bool axi_m_axis_tvalid; // Ready to receive data - indicator

[Kiwi.InputBitPort("axi_m_axis_tready")] // m_axis_tready
protected internal static bool axi_m_axis_tready; // Ready to receive data - indicator

[Kiwi.OutputBitPort("axi_m_axis_tdata_0")] // m_axis_tdata
protected internal static ulong axi_m_axis_tdata_0; // Data to be received

[Kiwi.OutputBitPort("axi_m_axis_tdata_1")] // m_axis_tdata
protected internal static ulong axi_m_axis_tdata_1; // Data to be received

[Kiwi.OutputBitPort("axi_m_axis_tdata_2")] // m_axis_tdata
protected internal static ulong axi_m_axis_tdata_2; // Data to be received

[Kiwi.OutputBitPort("axi_m_axis_tdata_3")] // m_axis_tdata
protected internal static ulong axi_m_axis_tdata_3; // Data to be received

[Kiwi.OutputBitPort("axi_m_axis_tstrb")] // m_axis_tkeep
protected internal static uint axi_m_axis_tstrb; // Offset of valid bytes in the data bus

[Kiwi.OutputBitPort("axi_m_axis_tkeep")] // m_axis_tkeep
protected internal static uint axi_m_axis_tkeep; // Offset of valid bytes in the data bus

[Kiwi.OutputBitPort("axi_m_axis_tlast")] // m_axis_tlast
protected internal static bool axi_m_axis_tlast; // End of frame indicator

[Kiwi.OutputBitPort("axi_m_axis_tid")] // m_axis_tvalid
protected internal static bool axi_m_axis_tid; // Valid data on the bus - indicator

[Kiwi.OutputWordPort("axi_m_axis_tdest")] // m_axis_tuser_hi
protected internal static ulong axi_m_axis_tdest; // metadata

[Kiwi.OutputWordPort("axi_m_axis_tuser_0")] // m_axis_tuser_low
protected internal static ulong axi_m_axis_tuser_0; // metadata

[Kiwi.OutputWordPort("axi_m_axis_tuser_1")] // m_axis_tuser_low
protected internal static ulong axi_m_axis_tuser_1; // metadata

// AXI Slave Ports
[Kiwi.InputBitPort("axi_s_axis_tvalid")] // s_axis_tready
protected internal static bool axi_s_axis_tvalid; // Ready to receive data - indicator

[Kiwi.OutputBitPort("axi_s_axis_tready")] // s_axis_tready
protected internal static bool axi_s_axis_tready; // Ready to receive data - indicator

[Kiwi.InputWordPort("axi_s_axis_tdata_0")] // s_axis_tdata
protected internal static ulong axi_s_axis_tdata_0; // Data to be received

[Kiwi.InputWordPort("axi_s_axis_tdata_1")] // s_axis_tdata
protected internal static ulong axi_s_axis_tdata_1; // Data to be received

[Kiwi.InputWordPort("axi_s_axis_tdata_2")] // s_axis_tdata
protected internal static ulong axi_s_axis_tdata_2; // Data to be received

[Kiwi.InputWordPort("axi_s_axis_tdata_3")] // s_axis_tdata
protected internal static ulong axi_s_axis_tdata_3; // Data to be received

[Kiwi.InputBitPort("axi_s_axis_tstrb")] // s_axis_tkeep
protected internal static uint axi_s_axis_tstrb; // Offset of valid bytes in the data bus

[Kiwi.InputBitPort("axi_s_axis_tkeep")] // s_axis_tkeep
protected internal static uint axi_s_axis_tkeep; // Offset of valid bytes in the data bus

[Kiwi.InputBitPort("axi_s_axis_tlast")] // s_axis_tlast
protected internal static bool axi_s_axis_tlast; // End of frame indicator

[Kiwi.InputBitPort("axi_s_axis_tid")] // s_axis_tvalid
protected internal static bool axi_s_axis_tid; // Valid data on the bus - indicator

[Kiwi.InputWordPort("axi_s_axis_tdest")] // s_axis_tuser_hi
protected internal static ulong axi_s_axis_tdest; // metadata

[Kiwi.InputWordPort("axi_s_axis_tuser_0")] // s_axis_tuser_low
protected internal static ulong axi_s_axis_tuser_0; // metadata

[Kiwi.InputWordPort("axi_s_axis_tuser_1")] // s_axis_tuser_low
protected internal static ulong axi_s_axis_tuser_1; // metadata

// Debug register - Output Port
[Kiwi.OutputWordPort("debug_reg")] // debug_reg
protected internal static uint debug_reg = 0x00; // Register for debuging purpose

// Registers
[Kiwi.OutputWordPort("PktIn")]
protected internal static uint PktIn = 0x00; // Incoming Packet Counter

[Kiwi.OutputWordPort("PktOut")]
protected internal static uint PktOut = 0x00; // Outgoing Packet Counter

[Kiwi.OutputWordPort("Interrupts")]
protected internal static ulong Interrupts = 0x00; // Interrupt indicator

[Kiwi.OutputWordPort("Status")]
protected internal static ulong Status = 0x00; // Status indicator

protected internal static ulong DEFAULT_oqs = 0x0000000000550000;

public static uint SwapEndian(uint x)
{
return ((x & 0x000000ff) << 24) | ((x & 0x0000ff00) << 8) |
((x & 0x00ff0000) >> 8) | ((x & 0xff000000) >> 24);
}

public static ulong SwapEndian(ulong x)
{
return ((x & 0x00000000000000ff) << 56) |
((x & 0x000000000000ff00) << 40) |
((x & 0x0000000000ff0000) << 24) |
((x & 0x00000000ff000000) << 8) |
((x & 0x000000ff00000000) >> 8) |
((x & 0x0000ff0000000000) >> 24) |
((x & 0x00ff000000000000) >> 40) |
((x & 0xff00000000000000) >> 56);
}
}
}
Loading