From 083bd54121f27bdda3efe72f7e1532254530d26b Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Fri, 16 Jan 2015 20:25:11 +0100 Subject: [PATCH] global clean up - remove initial sims - remove SATAPHYDeviceCtrl - rename to LiteSATA - rename test to bist --- Makefile | 2 +- README | 66 +++-- lib/sata/phy/__init__.py | 1 + lib/sata/phy/ctrl.py | 110 --------- sim/compile_rtl.tcl | 11 - sim/compile_tb.tcl | 8 - sim/glbl.v | 66 ----- sim/hdl_common/hdl_0in.tcl | 29 --- sim/hdl_common/hdl_common.tcl | 406 ------------------------------- sim/hdl_common/hdl_formality.tcl | 32 --- sim/hdl_common/hdl_modelsim.tcl | 80 ------ sim/hdl_common/hdl_ncsim.tcl | 91 ------- sim/hdl_common/hdl_quartus.tcl | 35 --- sim/hdl_common/hdl_synopsys.tcl | 33 --- sim/hdl_common/hdl_synplify.tcl | 36 --- sim/hdl_common/hdl_xst.tcl | 37 --- sim/sim.do | 32 --- sim/sim.png | Bin 24448 -> 0 bytes sim/top_tb.v | 43 ---- sim/wave.do | 32 --- targets/{test.py => bist.py} | 140 +++++------ 21 files changed, 110 insertions(+), 1180 deletions(-) delete mode 100644 sim/compile_rtl.tcl delete mode 100644 sim/compile_tb.tcl delete mode 100644 sim/glbl.v delete mode 100644 sim/hdl_common/hdl_0in.tcl delete mode 100644 sim/hdl_common/hdl_common.tcl delete mode 100644 sim/hdl_common/hdl_formality.tcl delete mode 100644 sim/hdl_common/hdl_modelsim.tcl delete mode 100644 sim/hdl_common/hdl_ncsim.tcl delete mode 100644 sim/hdl_common/hdl_quartus.tcl delete mode 100644 sim/hdl_common/hdl_synopsys.tcl delete mode 100644 sim/hdl_common/hdl_synplify.tcl delete mode 100644 sim/hdl_common/hdl_xst.tcl delete mode 100644 sim/sim.do delete mode 100644 sim/sim.png delete mode 100644 sim/top_tb.v delete mode 100644 sim/wave.do rename targets/{test.py => bist.py} (63%) diff --git a/Makefile b/Makefile index a2d6c3d52..8310d4cc6 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ TOOLCHAIN = vivado PLATFORM = kc705 PROGRAMMER = vivado -CMD = $(PYTHON) make.py -X $(CURDIR) -Op toolchain $(TOOLCHAIN) -Op programmer $(PROGRAMMER) -p $(PLATFORM) -t test +CMD = $(PYTHON) make.py -X $(CURDIR) -Op toolchain $(TOOLCHAIN) -Op programmer $(PROGRAMMER) -p $(PLATFORM) -t bist csv: cd $(MSCDIR) && $(CMD) --csr_csv $(CURDIR)/test/csr.csv build-csr-csv -Ot export_mila True diff --git a/README b/README index 06bac974d..aee897036 100644 --- a/README +++ b/README @@ -1,31 +1,57 @@ - _____ _ ____ _ _ _ _ - | __|___ |_|___ _ _ | \|_|___|_| |_ ___| | - | __| | | | . | | | | | | | . | | _| .'| | - |_____|_|_|_| |___|_ | |____/|_|_ |_|_| |__,|_| - |___| |___| |___| - - Copyright 2014 / Florent Kermarrec / florent@enjoy-digital.fr - - Kintex-7 SATA PHY for M-Labs +-------------------------------------------------------------------------------- + __ _ __ _______ _________ + / / (_) /____ / __/ _ /_ __/ _ | + / /__/ / __/ -_)\ \/ __ |/ / / __ | + /____/_/\__/\__/___/_/ |_/_/ /_/ |_| + + Copyright 2014-2015 / Florent Kermarrec / florent@enjoy-digital.fr + + A lite open-source SATA1/2/3 controller + developed in partnership with M-Labs Ltd / HKU -------------------------------------------------------------------------------- [> Getting started ------------------ -1. Obtain MiSoC and follow its "Quick start guide". Set the MSCDIR environment - variable to the MiSoC directory. +1. Install Python3 and Xilinx's Vivado software. -2. Build design: +2. Obtain Migen and install it: + git clone https://github.com/enjoy-digital/migen + cd migen + python3 setup.py install + cd .. + +3. Obtain Miscope and install it: + git clone https://github.com/enjoy-digital/miscope + cd miscope + python3 setup.py install + cd .. + +4. Obtain MiSoC: + git clone https://github.com/enjoy-digital/misoc --recursive + +5. Copy lite-sata in working directory and move to it. + +6. Build and load design: make all - -3. Load design: - make load -4. Run test: - make test +7. Test design: + go to test directory + python3 bist.py -[> Cores : - - UART2Wishbone bridge - - SATA PHY +[> Simulations : + Simulation are avalaible in ./lib/sata/test: + - crc_tb + - scrambler_tb + - phy_datapath_tb + - link_tb + - command_tb + - bist_tb + hdd.py is a HDD model with implementing all SATA layers. + To run a simulation, move to the simulation directory and run: + make simulation_name + +[> Tests : + A synthetisable BIST is provided. It can be controled with ./test/bist.py [> Contact E-mail: florent@enjoy-digital.fr diff --git a/lib/sata/phy/__init__.py b/lib/sata/phy/__init__.py index 37ad32fdc..98afb13c5 100644 --- a/lib/sata/phy/__init__.py +++ b/lib/sata/phy/__init__.py @@ -4,6 +4,7 @@ from lib.sata.phy.datapath import SATAPHYDatapath class SATAPHY(Module): def __init__(self, pads, clk_freq, host=True, device_family="k7", speed="SATA1"): + self.speed = speed # Transceiver / Clocks if device_family == "k7": from lib.sata.phy.k7.trx import K7SATAPHYTRX diff --git a/lib/sata/phy/ctrl.py b/lib/sata/phy/ctrl.py index 2e1731c37..c574d7ec2 100644 --- a/lib/sata/phy/ctrl.py +++ b/lib/sata/phy/ctrl.py @@ -163,113 +163,3 @@ class SATAPHYHostCtrl(Module): ) ) ) - -# Note : Tested only in simulation -class SATAPHYDeviceCtrl(Module): - def __init__(self, trx, crg, clk_freq): - self.ready = Signal() - - sink = Sink(phy_description(32)) - source = Source(phy_description(32)) - - ### - - self.comb += [ - source.stb.eq(1), - sink.ack.eq(1) - ] - - retry_timeout = SATAPHYHostCtrlTimeout(us(10000, clk_freq)) - align_timeout = SATAPHYHostCtrlTimeout(us(873, clk_freq)) - self.submodules += align_timeout, retry_timeout - - self.fsm = fsm = FSM(reset_state="RESET") - fsm.act("RESET", - trx.tx_idle.eq(1), - retry_timeout.load.eq(1), - align_timeout.load.eq(1), - If(crg.ready, - NextState("AWAIT_COMINIT") - ) - ) - fsm.act("AWAIT_COMINIT", - trx.tx_idle.eq(1), - If(trx.rx_cominit_stb, - NextState("AWAIT_NO_COMINIT") - ) - ) - fsm.act("AWAIT_NO_COMINIT", - trx.tx_idle.eq(1), - If(~trx.rx_cominit_stb, - NextState("COMINIT") - ) - ) - fsm.act("COMINIT", - trx.tx_idle.eq(1), - trx.tx_cominit_stb.eq(1), - If(trx.tx_cominit_ack, - NextState("AWAIT_COMWAKE") - ) - ) - fsm.act("AWAIT_COMWAKE", - trx.tx_idle.eq(1), - retry_timeout.dec.eq(1), - If(trx.rx_comwake_stb, - NextState("AWAIT_NO_COMWAKE") - ).Else( - If(retry_timeout.reached, - NextState("RESET") - ) - ) - ) - fsm.act("AWAIT_NO_COMWAKE", - trx.tx_idle.eq(1), - If(~trx.rx_comwake_stb, - NextState("CALIBRATE") - ) - ) - fsm.act("CALIBRATE", - trx.tx_idle.eq(1), - NextState("COMWAKE") - ) - fsm.act("COMWAKE", - trx.tx_idle.eq(1), - trx.tx_comwake_stb.eq(1), - If(trx.tx_comwake_stb, - NextState("RESET_CRG"), - crg.reset.eq(1), - ) - ) - fsm.act("RESET_CRG", - trx.tx_idle.eq(0), - If(crg.ready, - NextState("SEND_ALIGN") - ) - ) - fsm.act("SEND_ALIGN", - trx.tx_idle.eq(0), - trx.rx_align.eq(1), - source.data.eq(primitives["ALIGN"]), - source.charisk.eq(0b0001), - align_timeout.dec.eq(1), - If(align_detect, - NextState("READY") - ).Elif(align_timeout.reached, - NextState("ERROR") - ) - ) - fsm.act("READY", - trx.tx_idle.eq(0), - NextState("READY"), - If(trx.rx_idle, - NextState("RESET") - ), - self.ready.eq(1) - ) - fsm.act("ERROR", - trx.tx_idle.eq(1), - NextState("RESET") - ) - - self.comb += \ - align_detect.eq(sink.stb & (sink.data == primitives["ALIGN"])) diff --git a/sim/compile_rtl.tcl b/sim/compile_rtl.tcl deleted file mode 100644 index dba9f4a1f..000000000 --- a/sim/compile_rtl.tcl +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# -# Compilation of SoC RTL files -# -############################################################################## - -set HDL_WORK "work" - -hdl_compile -v 2005 { - ../../misoc/build/simdesign-kc705.v -} \ No newline at end of file diff --git a/sim/compile_tb.tcl b/sim/compile_tb.tcl deleted file mode 100644 index 4c880f10a..000000000 --- a/sim/compile_tb.tcl +++ /dev/null @@ -1,8 +0,0 @@ -############################################################################## -# -# Compilation of MiSoC TB files -# -############################################################################## -hdl_compile -sim glbl.v - -hdl_compile -sim top_tb.v diff --git a/sim/glbl.v b/sim/glbl.v deleted file mode 100644 index 0e0b3c6cd..000000000 --- a/sim/glbl.v +++ /dev/null @@ -1,66 +0,0 @@ -// $Header: /devl/xcs/repo/env/Databases/CAEInterfaces/verunilibs/data/glbl.v,v 1.15 2011/08/25 22:54:30 fphillip Exp $ - -`timescale 1 ps / 1 ps - -module glbl (); - - parameter ROC_WIDTH = 100000; - parameter TOC_WIDTH = 0; - -//-------- STARTUP Globals -------------- - wire GSR; - wire GTS; - wire GWE; - wire PRLD; - tri1 p_up_tmp; - tri (weak1, strong0) PLL_LOCKG = p_up_tmp; - - wire PROGB_GLBL; - wire CCLKO_GLBL; - - reg GSR_int; - reg GTS_int; - reg PRLD_int; - -//-------- JTAG Globals -------------- - wire JTAG_TDO_GLBL; - wire JTAG_TCK_GLBL; - wire JTAG_TDI_GLBL; - wire JTAG_TMS_GLBL; - wire JTAG_TRST_GLBL; - - reg JTAG_CAPTURE_GLBL; - reg JTAG_RESET_GLBL; - reg JTAG_SHIFT_GLBL; - reg JTAG_UPDATE_GLBL; - reg JTAG_RUNTEST_GLBL; - - reg JTAG_SEL1_GLBL = 0; - reg JTAG_SEL2_GLBL = 0 ; - reg JTAG_SEL3_GLBL = 0; - reg JTAG_SEL4_GLBL = 0; - - reg JTAG_USER_TDO1_GLBL = 1'bz; - reg JTAG_USER_TDO2_GLBL = 1'bz; - reg JTAG_USER_TDO3_GLBL = 1'bz; - reg JTAG_USER_TDO4_GLBL = 1'bz; - - assign (weak1, weak0) GSR = GSR_int; - assign (weak1, weak0) GTS = GTS_int; - assign (weak1, weak0) PRLD = PRLD_int; - - initial begin - GSR_int = 1'b1; - PRLD_int = 1'b1; - #(ROC_WIDTH) - GSR_int = 1'b0; - PRLD_int = 1'b0; - end - - initial begin - GTS_int = 1'b1; - #(TOC_WIDTH) - GTS_int = 1'b0; - end - -endmodule diff --git a/sim/hdl_common/hdl_0in.tcl b/sim/hdl_common/hdl_0in.tcl deleted file mode 100644 index 0f8cf423f..000000000 --- a/sim/hdl_common/hdl_0in.tcl +++ /dev/null @@ -1,29 +0,0 @@ -set HDL_TOOLTYPE SIMULATION -set HDL_TOOLNAME 0in -set HDL_PUTS puts -set HDL_MSG_FORMAT "********** %s **********" - -proc hdl_tool_library {lib} { -} - -proc hdl_tool_compile {format version incdirs library define files behavioral} { - set command analyze - lappend command -work [string tolower $library] - switch $format { - "vhdl" { - lappend command -vhdl - } - "verilog" { - foreach d $define { - lappend command +define+$d - } - foreach i $incdirs { - lappend command +incdir+$i - } - } - } - foreach f $files { - lappend command $f - } - puts [eval $command] -} diff --git a/sim/hdl_common/hdl_common.tcl b/sim/hdl_common/hdl_common.tcl deleted file mode 100644 index abb7b585a..000000000 --- a/sim/hdl_common/hdl_common.tcl +++ /dev/null @@ -1,406 +0,0 @@ -############################################################################## -# Define some global variables -############################################################################## - -if {![info exists HDL_LIBRARIES]} { - set HDL_LIBRARIES () -} -set HDL_TARGET "default_target" -set HDL_PATH [pwd] -set HDL_WORK "work" - -# Uncomment the following line to generate a log file for debug -#set HDL_LOG [open "hdl_common.log" "w"] - -############################################################################## -# Some utilities -############################################################################## - -# Extract first element from a list (for argument processing) -proc extract_first {list_name {option ""}} { - upvar $list_name mylist - if {[string length $option]>0 && [llength $mylist]==0} { - error "Missing argument for option $option" - } - set first [lindex $mylist 0] - if {[string length $option]>0 && [string match "-*" $first]} { - error "Missing argument for option $option" - } - set mylist [lrange $mylist 1 end] - return $first -} - -# Clean-up file path -proc clean_path {f} { - # Add trailing / - set f "$f/" - # Remove double / (excepted leading) - while {[regsub {(.)//} $f "\1/" f]} {} - # Remove . - while {[regsub {/\./} $f "/" f]} {} - # Remove .. - while {[regsub {/[^/.]+/\.\./} $f "/" f]} {} - # Remove trailing / - regsub {/$} $f "" f - return $f -} - -# Translate relative paths to absolute paths -proc get_full_path {files} { - global HDL_PATH - set r {} - # For DOS paths, replace \ by / - regsub -all {\\} $files "/" files - foreach f $files { - hdl_debug " $f" - # Append file path - if {[string match "/*" $f] || [string match "?:/*" $f]} { - # Path is an absolute path - hdl_warning "Using absolute path $f" - } else { - # Path is a relative path - set f [clean_path $HDL_PATH/$f] - } - hdl_debug " => $f" - lappend r $f - # Check access to file - if {![file readable $f]} { - error "Cannot read file $f" - } - } - return $r -} - -# Check if value match any pattern in the list -proc match_list {mlist value} { - set match 0 - foreach m $mlist { - if [string match $m $value] { - set match 1 - } - } - return $match -} - -proc get_lib_path {} { - if [file isdirectory "/cad/trash"] { - set libs "/cad/trash[pwd]/libs" - } elseif [file isdirectory "e:/trash"] { - set libs [pwd] - # Replace D:/ by D/ for local drive - regsub ":" $libs "" libs - # Remove leading // for network drive - regsub "//" $libs "" libs - set libs "e:/trash/$libs" - } else { - # No "trash" directory on this machine => work locally - set libs "./libs" - } - file mkdir $libs - return $libs -} - -############################################################################## -# Procedures to display messages -############################################################################## - -# Write message to log file if logging enabled -proc hdl_log { msg } { - global HDL_LOG - if [info exists HDL_LOG] { - puts $HDL_LOG $msg - flush $HDL_LOG - } - return -} - -# Debug messages are sent only to log file -proc hdl_debug { msg } { - hdl_log "hdl_common - Debug: $msg" - return -} - -# According to the tool, "puts" or "echo" should be used -# HDL_PUTS variable is used for this purpose -# All message are also sent to log file -proc hdl_puts { msg } { - global HDL_PUTS - $HDL_PUTS $msg - hdl_log $msg - return -} - -proc hdl_note { msg } { - hdl_puts "hdl_common - Note: $msg" - return -} - -proc hdl_warning { msg } { - hdl_puts "hdl_common - Warning: $msg" - return -} - -proc hdl_message { args } { - global HDL_MSG_FORMAT - hdl_puts [format $HDL_MSG_FORMAT [join $args " "]] - return -} - -############################################################################## -# Procedures for compilation scripts -############################################################################## - -# Compile source files -proc hdl_compile { args } { - global HDL_TOOLTYPE HDL_TOOLNAME HDL_TARGET HDL_LIBRARIES HDL_WORK - # Default values - set format "" - set version "93" - set files {} - set incdirs {} - set only_for {} - set not_for {} - set toolname {} - set tooltype "*" - set library $HDL_WORK - set define {} - set behavioral 0 - - # Decode arguments - while {[llength $args]} { - set arg [extract_first args] - switch -glob -- $arg { - "-f" { - set format [extract_first args "-f"] - } - "-v" { - set version [extract_first args "-version"] - } - "-only_for" { - set only_for [concat $only_for [extract_first args "-only_for"]] - } - "-not_for" { - set not_for [concat $not_for [extract_first args "-not_for"]] - } - "-sim" { - set tooltype "SIMULATION" - set behavioral 1 - } - "-syn" { - set tooltype "SYNTHESIS" - set behavioral 0 - } - "-tool" { - set toolname [concat $toolname [extract_first args "-tool"]] - } - "-incdir" { - set incdirs [concat $incdirs [extract_first args "-incdir"]] - } - "-lib" { - set library [extract_first args "-lib"] - if {[string match "work" $library]} { - hdl_warning "Specifying '-lib work' is useless" - } - } - "-define" { - set define [concat $define [extract_first args "-define"]] - } - "-*" { - error "Unsupported argument $arg" - } - default { - set files [concat $files $arg] - } - } - } - - # Check arguments - if {![llength $files]} { - error "No file to compile" - } - # If no "-only_for" option given, use file for any target - if {[llength $only_for]==0} { - set only_for {*} - } - # If no "-tool" option given, use file for any tool - if {[llength $toolname]==0} { - set toolname {*} - } - - # Check if compilation is required - if {[match_list $only_for $HDL_TARGET] && ![match_list $not_for $HDL_TARGET] && - [string match $tooltype $HDL_TOOLTYPE] && [match_list $toolname $HDL_TOOLNAME]} { - # Create library if needed - if {[lsearch -exact $HDL_LIBRARIES $library]<0} { - hdl_note "Creating library $library" - lappend HDL_LIBRARIES $library - hdl_tool_library $library - } - # Compile files - foreach f $files { - # Warning if dummy file is used - if {[string match "*dummy*" [string tolower $f]]} { - hdl_note "Using [file tail $f]" - } - # Determine format - if {![llength $format]} { - if {[string match "*.vh?*" $f]} { - set format "vhdl" - } elseif {[string match "*.v*" $f]} { - set format "verilog" - set version "sv" - } elseif {[string match "*.sv" $f]} { - set format "verilog" - set version "sv" - } - } - } - hdl_tool_compile $format $version [get_full_path $incdirs] $library $define [get_full_path $files] $behavioral - } - return -} - -# Change directory -proc hdl_cd { path } { - global HDL_PATH - set HDL_PATH [get_full_path $path] - hdl_debug "New path is $HDL_PATH" - return -} - -# Execute script -proc hdl_source { args } { - global HDL_PATH HDL_TARGET HDL_WORK HDL_TOOLTYPE HDL_TOOLNAME - # Save original values - set save_path $HDL_PATH - set save_target $HDL_TARGET - set save_work $HDL_WORK - # Default value - set files {} - set toolname {} - set tooltype "*" - set only_for {} - set not_for {} - # Process options - while {[llength $args]} { - set arg [extract_first args] - switch -glob -- $arg { - "-lib" { - set HDL_WORK [extract_first args "-lib"] - if {[string match "work" $HDL_WORK]} { - hdl_warning "Specifying '-lib work' is useless" - } - } - "-target" { - set HDL_TARGET [extract_first args "-target"] - } - "-sim" { - set tooltype "SIMULATION" - set behavioral 1 - } - "-syn" { - set tooltype "SYNTHESIS" - set behavioral 0 - } - "-tool" { - set toolname [concat $toolname [extract_first args "-tool"]] - } - "-only_for" { - set only_for [concat $only_for [extract_first args "-only_for"]] - } - "-not_for" { - set not_for [concat $not_for [extract_first args "-not_for"]] - } - "-*" { - error "Unsupported argument $arg" - } - default { - set files [concat $files $arg] - } - } - } - # Check arguments - if {![llength $files]} { - error "No script specified" - } - # If no "-only_for" option given, use file for any target - if {[llength $only_for]==0} { - set only_for {*} - } - # If no "-tool" option given, use file for any tool - if {[llength $toolname]==0} { - set toolname {*} - } - - # Check if compilation is required - if {[match_list $only_for $HDL_TARGET] && ![match_list $not_for $HDL_TARGET] && - [string match $tooltype $HDL_TOOLTYPE] && [match_list $toolname $HDL_TOOLNAME]} { - # Source scripts - foreach script $files { - # Change directory to script location - hdl_cd [file dirname $script] - # Execute script - set script [get_full_path [file tail $script]] - hdl_note "Source $script ($HDL_TARGET)" - uplevel source $script - # Restore original path - set HDL_PATH $save_path - hdl_debug "Back to directory $HDL_PATH" - } - } - # Restore original values - set HDL_TARGET $save_target - set HDL_WORK $save_work - #puts "Back to $HDL_PATH" - return -} - -# Specify target -proc hdl_set_target { args } { - global HDL_TARGET env - # Default values - set use_env 0 - set default "" - set target "" - # Decode arguments - while {[llength $args]} { - set arg [extract_first args] - switch -glob -- $arg { - "-env" { - set use_env 1 - } - "-default" { - set default [extract_first args "-default"] - } - "-*" { - error "Unsupported argument $arg" - } - default { - set target $arg - } - } - } - # Check arguments - if {[llength $target]} { - set HDL_TARGET $target - hdl_note "Using target $HDL_TARGET" - } elseif {$use_env} { - if {[info exists env(HDL_TARGET)]} { - set HDL_TARGET $env(HDL_TARGET) - hdl_note "Using target $HDL_TARGET (from environment variable HDL_TARGET)" - } elseif {[llength $default]} { - set HDL_TARGET $default - hdl_note "Using default target $HDL_TARGET (environment variable HDL_TARGET not defined)" - } else { - error "No environment variable defined and no default target" - } - } else { - error "Missing argument" - } - return -} - -############################################################################## - -# clock is an invalid command name for Synplify at least until version 2010.09 -# hdl_debug [clock format [clock seconds]] diff --git a/sim/hdl_common/hdl_formality.tcl b/sim/hdl_common/hdl_formality.tcl deleted file mode 100644 index b33c81790..000000000 --- a/sim/hdl_common/hdl_formality.tcl +++ /dev/null @@ -1,32 +0,0 @@ -set HDL_TOOLTYPE SYNTHESIS -set HDL_TOOLNAME formality -set HDL_PUTS puts -set HDL_MSG_FORMAT "\n********** %s **********\n" - -proc hdl_tool_library {lib} { - define_design_lib $lib -path lib_$lib -} - -proc hdl_tool_compile {format version incdirs library define files behavioral} { - global search_path - if {[llength $define]} { - error "-define not yet supported" - } - # Add include paths - set search_path [concat $incdirs $search_path] - # Compile files - foreach f $files { - if {[string match $format "vhdl"]} { - if {[string match $version "93"]} { - read_vhdl -93 -libname $library $f - } else { - read_vhdl -libname $library $f - } - } else { - read_verilog -01 -libname $library $f - } - puts "" - } - # Remove include paths - set search_path [lrange $search_path [llength $incdirs] end] -} diff --git a/sim/hdl_common/hdl_modelsim.tcl b/sim/hdl_common/hdl_modelsim.tcl deleted file mode 100644 index a9c43a9ae..000000000 --- a/sim/hdl_common/hdl_modelsim.tcl +++ /dev/null @@ -1,80 +0,0 @@ -# Set the option CHECK_SYNTHESIS to 1 if you want to have -check_synthesis in simulation. For now -# tools like Modelsim generate too many false positives so it is disabled by default: - -set CHECK_SYNTHESIS 0 - -set NO_DEBUG 0 - -set HDL_TOOLTYPE SIMULATION -set HDL_TOOLNAME modelsim -set HDL_PUTS echo -set HDL_MSG_FORMAT "********** %s **********" - -# Return the directory containing library lib -proc getvmap {lib} { - if {[catch {vmap $lib} result]} { - # Library does not exist yet => default directory - return $lib - } - set dir "" - # Get directory returned by vmap - regexp { maps to directory (.*)\.$} $result match dir - return $dir -} - -proc hdl_tool_library {lib} { - set lib [string tolower $lib] - # Delete library - set path [getvmap $lib] - if {[file isdirectory $path]} { - catch { - vdel -lib $path -all - } - } - # Create library - set path [get_lib_path]/$lib - vlib $path - vmap $lib $path -} - -proc hdl_tool_compile {format version incdirs library define files behavioral} { - global CHECK_SYNTHESIS - global NO_DEBUG - switch $format { - "vhdl" { - set command vcom - if { $version == 87 } { - lappend command -87 - } elseif { $version == 93 } { - lappend command -93 - } - # More strict for synthesizable modules - if { ! $behavioral && $CHECK_SYNTHESIS } { - lappend command -check_synthesis - } - } - "verilog" { - set command vlog - if {$version == "sv"} { - lappend command -sv - } - lappend command -timescale "1ns/1ns" - foreach d $define { - lappend command +define+$d - } - foreach i $incdirs { - lappend command +incdir+$i - } - } - } - if {$NO_DEBUG} { - lappend command -nodebug - } - lappend command -work [string tolower $library] - lappend command -quiet - foreach f $files { - lappend command $f - } - puts -nonewline [eval $command] - return -} diff --git a/sim/hdl_common/hdl_ncsim.tcl b/sim/hdl_common/hdl_ncsim.tcl deleted file mode 100644 index d983f2318..000000000 --- a/sim/hdl_common/hdl_ncsim.tcl +++ /dev/null @@ -1,91 +0,0 @@ -set HDL_TOOLTYPE SIMULATION -set HDL_TOOLNAME ncsim -set HDL_PUTS puts -set HDL_MSG_FORMAT "********** %s **********" - -if {![file exists hdl.var]} { - hdl_note "Creating default hdl.var" - exec echo "DEFINE WORK work" > hdl.var -} - -if {![file exists cds.lib]} { - hdl_note "Creating default cds.lib" - exec echo "# This file was created automatically by hdl_ncsim.tcl" > cds.lib - exec echo "# You can edit this file" >> cds.lib - exec echo "# Please add the libraries that are not handled by hdl_ncsim.tcl" >> cds.lib - exec echo "# (for example the Xilinx libraries compiled with compxlib)" >> cds.lib - exec echo {INCLUDE ${CDS_INST_DIR}/tools/inca/files/cds.lib} >> cds.lib -} - -proc no_matching_line {pattern file} { - return [catch {exec grep -q $pattern $file}] -} - -if {[no_matching_line "^INCLUDE mycds.lib$" cds.lib]} { - hdl_note "Including mycds.lib in cds.lib" - exec echo "INCLUDE mycds.lib" >> cds.lib -} - -hdl_note "Clean-up mycds.lib" -exec echo "# This file is written automatically by hdl_ncsim.tcl" > mycds.lib -exec echo "# Do not edit this file" >> mycds.lib -exec echo "# It will be overwritten at each compilation" >> mycds.lib - -proc hdl_tool_library {lib} { - set lib [string tolower $lib] - set path [get_lib_path]/${lib}_nc - exec echo "DEFINE $lib $path" >> mycds.lib - exec touch $path - exec rm -r $path - exec mkdir $path -} - -proc hdl_tool_compile {format version incdirs library define files behavioral} { - switch $format { - "vhdl" { - set command "ncvhdl" - if {$version != 87} { - lappend command -v93 - } - # Less strict VHDL for behavioral modules - if {$behavioral} { - lappend command -relax - } - } - "verilog" { - set command "ncvlog" - if {$version == "sv"} { - lappend command -sv - } - foreach d $define { - lappend command -define $d - } - foreach i $incdirs { - lappend command -incdir $i - } - } - } - lappend command -work [string tolower $library] - lappend command -nocopyright - foreach f $files { - lappend command $f - } - eval $command -} - -# Allow launching NC-Sim tools directly in TCL -proc ncvlog { args } { - puts -nonewline [eval exec -keepnewline ncvlog $args] -} -proc ncvhdl { args } { - puts -nonewline [eval exec -keepnewline ncvhdl $args] -} -proc ncelab { args } { - puts -nonewline [eval exec -keepnewline ncelab $args] -} -proc ncsdfc { args } { - puts -nonewline [eval exec -keepnewline ncsdfc $args] -} -proc ncsim { args } { - puts -nonewline [eval exec -keepnewline ncsim $args] -} diff --git a/sim/hdl_common/hdl_quartus.tcl b/sim/hdl_common/hdl_quartus.tcl deleted file mode 100644 index 69ba61442..000000000 --- a/sim/hdl_common/hdl_quartus.tcl +++ /dev/null @@ -1,35 +0,0 @@ -set HDL_TOOLTYPE SYNTHESIS -set HDL_TOOLNAME QuartusII -set HDL_PUTS puts -set HDL_MSG_FORMAT "********** %s **********" - - -proc hdl_tool_library {lib_list} { -} - -proc hdl_tool_compile {format version incdirs library define files behavioral} { - #if {[llength $incdirs]} { - # error "-incdir not yet supported" - #} - switch $format { - "vhdl" { - foreach f $files { - set_global_assignment -name VHDL_FILE $f -library $library - } - } - "verilog" { - foreach d $define { - set_global_assignment -name VERILOG_MACRO $d - } - foreach f $files { - set_global_assignment -name VERILOG_FILE $f -library $library - } - } - } -} - -if { [catch { puts "Quartus hdl_common script" } ] } { - # Disable puts for Quartus (doesn't work with the GUI since no stdout channel) - proc hdl_puts { msg } { - } -} diff --git a/sim/hdl_common/hdl_synopsys.tcl b/sim/hdl_common/hdl_synopsys.tcl deleted file mode 100644 index 24d53d97c..000000000 --- a/sim/hdl_common/hdl_synopsys.tcl +++ /dev/null @@ -1,33 +0,0 @@ -set HDL_TOOLTYPE SYNTHESIS -set HDL_TOOLNAME synopsys -set HDL_PUTS puts -set HDL_MSG_FORMAT "\n********** %s **********\n" - -proc hdl_tool_library {lib_list} { - foreach l $lib_list { - set path [get_lib_path]/$l - sh touch $path - sh rm -r $path - sh mkdir $path - define_design_lib $l -path $path - } -} - -proc hdl_tool_compile {format version incdirs library define files behavioral} { - global search_path - if {[llength $define]} { - error "-define not yet supported" - } - # Add include paths - set search_path [concat $incdirs $search_path] - # Compile files - foreach f $files { - if {[string match $format "vhdl"]} { - puts "Compiling source file $f" - } - analyze -format $format -work $library $f - puts "" - } - # Remove include paths - set search_path [lrange $search_path [llength $incdirs] end] -} diff --git a/sim/hdl_common/hdl_synplify.tcl b/sim/hdl_common/hdl_synplify.tcl deleted file mode 100644 index 46f915a4d..000000000 --- a/sim/hdl_common/hdl_synplify.tcl +++ /dev/null @@ -1,36 +0,0 @@ -set HDL_TOOLTYPE SYNTHESIS -set HDL_TOOLNAME synplify -set HDL_PUTS puts -set HDL_MSG_FORMAT "********** %s **********" - -proc hdl_tool_library {lib_list} { -} - -proc hdl_tool_compile {format version incdirs library define files behavioral} { - if {[llength $define]} { - error "-define not yet supported" - } - switch $format { - "vhdl" { - foreach f $files { - add_file -vhdl -lib $library $f - } - } - "verilog" { - foreach i $incdirs { - set_option -include_path "$i" - } - foreach f $files { - add_file -verilog $f - } - } - "ngc" { - foreach i $incdirs { - set_option -include_path "$i" - } - foreach f $files { - add_file -xilinx $f - } - } - } -} diff --git a/sim/hdl_common/hdl_xst.tcl b/sim/hdl_common/hdl_xst.tcl deleted file mode 100644 index 53f489fad..000000000 --- a/sim/hdl_common/hdl_xst.tcl +++ /dev/null @@ -1,37 +0,0 @@ -set HDL_TOOLTYPE SYNTHESIS -set HDL_TOOLNAME XST -set HDL_PUTS puts -set HDL_MSG_FORMAT "********** %s **********" - -proc hdl_tool_library {lib_list} { -} - -proc hdl_tool_compile {format version incdirs library define files behavioral} { - global PROJECT_FILE - - # do not use append, based on http://wiki.tcl.tk/1241 - set projectfile [open $PROJECT_FILE {WRONLY CREAT APPEND}] - - if {[llength $define]} { - error "-define not yet supported" - } - if {[llength $incdirs]} { - error "-incdirs not yet supported" - } - puts "checking format" - switch $format { - "vhdl" { - foreach f $files { - puts $projectfile "vhdl $library $f" - } - } - "verilog" { - foreach f $files { - puts $projectfile "verilog $library $f" - } - } - } - - close $projectfile - -} \ No newline at end of file diff --git a/sim/sim.do b/sim/sim.do deleted file mode 100644 index 0015f47c1..000000000 --- a/sim/sim.do +++ /dev/null @@ -1,32 +0,0 @@ -transcript on -transcript file CustomTranscript - -############################################################################## -# Setup libraries -vlib work -vmap unisims_ver D:/Installs/Logiciels/Xilinx/ISE14.6/14.6/ISE_DS/ISE/verilog/mti_se/10.1c/nt/unisims_ver -vmap secureip D:/Installs/Logiciels/Xilinx/ISE14.6/14.6/ISE_DS/ISE/verilog/mti_se/10.1c/nt/secureip - -# Compile design -############################################################################## - -source hdl_common/hdl_common.tcl -source hdl_common/hdl_modelsim.tcl - -hdl_source compile_rtl.tcl -hdl_source compile_tb.tcl - -############################################################################## -# Run simulation -############################################################################## - -vsim -t ps -L secureip -L unisims_ver -novopt glbl top_tb - -set NumericStdNoWarnings 1 -set StdArithNoWarnings 1 - -log -r * -do wave.do - -onbreak {resume} -run 2000us diff --git a/sim/sim.png b/sim/sim.png deleted file mode 100644 index d4e9e9e7c2befb8ae75c7f12d86e18e4e33fe170..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24448 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 TJq4Va54v+p{$`4V&a?jqh;b{T diff --git a/sim/top_tb.v b/sim/top_tb.v deleted file mode 100644 index fa9700afa..000000000 --- a/sim/top_tb.v +++ /dev/null @@ -1,43 +0,0 @@ -`timescale 1ns/1ps - -module top_tb(); - -reg refclk_p; -wire refclk_n; -initial refclk_p = 1'b1; -always #3.33 refclk_p = ~refclk_p; -assign refclk_n = ~refclk_p; - -reg clk200_p; -wire clk200_n; -initial clk200_p = 1'b1; -always #2.5 clk200_p = ~clk200_p; -assign clk200_n = ~clk200_p; - -wire sata_txp; -wire sata_txn; -wire sata_rxp; -wire sata_rxn; - -top dut( - .serial_cts(1'b0), - .serial_rts(1'b0), - .serial_tx(), - .serial_rx(1'b0), - .clk200_p(clk200_p), - .clk200_n(clk200_n), - .sata_host_refclk_p(refclk_p), - .sata_host_refclk_n(refclk_n), - .sata_host_txp(sata_txp), - .sata_host_txn(sata_txn), - .sata_host_rxp(sata_rxp), - .sata_host_rxn(sata_rxn), - .sata_device_refclk_p(refclk_p), - .sata_device_refclk_n(refclk_n), - .sata_device_txp(sata_rxp), - .sata_device_txn(sata_rxn), - .sata_device_rxp(sata_txp), - .sata_device_rxn(sata_txn) -); - -endmodule diff --git a/sim/wave.do b/sim/wave.do deleted file mode 100644 index 1a0f8ab13..000000000 --- a/sim/wave.do +++ /dev/null @@ -1,32 +0,0 @@ -onerror {resume} -quietly WaveActivateNextPane {} 0 -add wave -noupdate -radix hexadecimal /top_tb/dut/sataphy_host_source_payload_d -add wave -noupdate /top_tb/dut/sataphy_host_source_stb -add wave -noupdate -radix hexadecimal /top_tb/dut/sataphy_device_source_payload_d -add wave -noupdate -radix hexadecimal /top_tb/dut/sataphy_device_source_stb -add wave -noupdate -radix hexadecimal /top_tb/refclk_p -add wave -noupdate -radix hexadecimal /top_tb/refclk_n -add wave -noupdate -radix hexadecimal /top_tb/clk200_p -add wave -noupdate -radix hexadecimal /top_tb/clk200_n -add wave -noupdate -radix hexadecimal /top_tb/sata_txp -add wave -noupdate -radix hexadecimal /top_tb/sata_txn -add wave -noupdate -radix hexadecimal /top_tb/sata_rxp -add wave -noupdate -radix hexadecimal /top_tb/sata_rxn -TreeUpdate [SetDefaultTree] -WaveRestoreCursors {{Cursor 1} {16623348 ps} 0} {{Cursor 2} {21767465 ps} 0} -quietly wave cursor active 1 -configure wave -namecolwidth 446 -configure wave -valuecolwidth 100 -configure wave -justifyvalue left -configure wave -signalnamewidth 0 -configure wave -snapdistance 10 -configure wave -datasetprefix 0 -configure wave -rowmargin 4 -configure wave -childrowmargin 2 -configure wave -gridoffset 0 -configure wave -gridperiod 1 -configure wave -griddelta 40 -configure wave -timeline 0 -configure wave -timelineunits ps -update -WaveRestoreZoom {0 ps} {17730427 ps} diff --git a/targets/test.py b/targets/bist.py similarity index 63% rename from targets/test.py rename to targets/bist.py index 00fa7205e..0e101543c 100644 --- a/targets/test.py +++ b/targets/bist.py @@ -4,6 +4,7 @@ from migen.fhdl.std import * from migen.bank import csrgen from migen.bus import wishbone, csr from migen.bus import wishbone2csr +from migen.genlib.cdc import * from migen.genlib.resetsync import AsyncResetSynchronizer from migen.bank.description import * @@ -15,8 +16,6 @@ from lib.sata.phy import SATAPHY from lib.sata import SATACON from lib.sata.bist import SATABIST, SATABISTControl -from migen.genlib.cdc import * - class _CRG(Module): def __init__(self, platform): self.cd_sys = ClockDomain() @@ -38,7 +37,7 @@ class _CRG(Module): p_CLKFBOUT_MULT=5, p_DIVCLK_DIVIDE=1, i_CLKIN1=clk200_se, i_CLKFBIN=pll_fb, o_CLKFBOUT=pll_fb, - # 100MHz + # 166MHz p_CLKOUT0_DIVIDE=6, p_CLKOUT0_PHASE=0.0, o_CLKOUT0=pll_sys, p_CLKOUT1_DIVIDE=2, p_CLKOUT1_PHASE=0.0, #o_CLKOUT1=, @@ -53,7 +52,7 @@ class _CRG(Module): AsyncResetSynchronizer(self.cd_sys, ~pll_locked | platform.request("cpu_reset") | self.sata_reset), ] -class UART2WB(Module): +class GenSoC(Module): csr_base = 0x00000000 csr_data_width = 8 csr_map = { @@ -63,6 +62,7 @@ class UART2WB(Module): interrupt_map = {} cpu_type = None def __init__(self, platform, clk_freq): + # UART <--> Wishbone bridge self.uart2wb = UART2Wishbone(platform.request("serial"), clk_freq, baud=921600) # CSR bridge 0x00000000 (shadow @0x00000000) @@ -71,20 +71,9 @@ class UART2WB(Module): self._wb_slaves = [(lambda a: a[23:25] == 0, self.wishbone2csr.wishbone)] self.cpu_csr_regions = [] # list of (name, origin, busword, csr_list/Memory) - # CSR self.identifier = identifier.Identifier(0, int(clk_freq), 0) - def add_wb_master(self, wbm): - if self.finalized: - raise FinalizeError - self._wb_masters.append(wbm) - - def add_wb_slave(self, address_decoder, interface): - if self.finalized: - raise FinalizeError - self._wb_slaves.append((address_decoder, interface)) - def add_cpu_memory_region(self, name, origin, length): self.cpu_memory_regions.append((name, origin, length)) @@ -106,40 +95,26 @@ class UART2WB(Module): for name, memory, mapaddr, mmap in self.csrbankarray.srams: self.add_cpu_csr_region(name, 0xe0000000+0x800*mapaddr, flen(rmap.bus.dat_w), memory) -class SimDesign(UART2WB): - default_platform = "kc705" - - def __init__(self, platform, export_mila=False): - clk_freq = 166*1000000 - UART2WB.__init__(self, platform, clk_freq) - self.crg = _CRG(platform) - - sata_phy_host = SATAPHY(platform.request("sata_host"), clk_freq, host=True) - self.comb += [ - self.sata_phy_host.sink.stb.eq(1), - self.sata_phy_host.sink.data.eq(primitives["SYNC"]), - self.sata_phy_host.sink.charisk.eq(0b0001) - ] - self.sata_phy_device = SATAPHY(platform.request("sata_device"), clk_freq, host=False) - self.comb += [ - self.sata_phy_device.sink.stb.eq(1), - self.sata_phy_device.sink.data.eq(primitives["SYNC"]), - self.sata_phy_device.sink.charisk.eq(0b0001) - ] - -class DebugLeds(Module): +class BISTLeds(Module): def __init__(self, platform, sata_phy): - # blinking leds (sata_rx and sata_tx clocks) + # 1Hz blinking leds (sata_rx and sata_tx clocks) sata_rx_led = platform.request("user_led", 0) sata_tx_led = platform.request("user_led", 1) sata_rx_cnt = Signal(32) sata_tx_cnt = Signal(32) + sata_freqs_mhz = { + "SATA3" : 150.0, + "SATA2" : 75.0, + "SATA1" : 37.5, + } + sata_freq = int(sata_freqs_mhz[sata_phy.speed]*1000*1000) + self.sync.sata_rx += \ If(sata_rx_cnt == 0, sata_rx_led.eq(~sata_rx_led), - sata_rx_cnt.eq(150*1000*1000//2) + sata_rx_cnt.eq(sata_freq//2) ).Else( sata_rx_cnt.eq(sata_rx_cnt-1) ) @@ -147,7 +122,7 @@ class DebugLeds(Module): self.sync.sata_tx += \ If(sata_tx_cnt == 0, sata_tx_led.eq(~sata_tx_led), - sata_tx_cnt.eq(150*1000*1000//2) + sata_tx_cnt.eq(sata_freq//2) ).Else( sata_tx_cnt.eq(sata_tx_cnt-1) ) @@ -156,62 +131,71 @@ class DebugLeds(Module): self.comb += platform.request("user_led", 2).eq(sata_phy.crg.ready) self.comb += platform.request("user_led", 3).eq(sata_phy.ctrl.ready) -class TestDesign(UART2WB, AutoCSR): +class BISTSoC(GenSoC, AutoCSR): default_platform = "kc705" csr_map = { "sata_bist": 10, - "mila": 11 } - csr_map.update(UART2WB.csr_map) + csr_map.update(GenSoC.csr_map) - def __init__(self, platform, with_mila=False, export_mila=False): + def __init__(self, platform, export_mila=False): clk_freq = 166*1000000 - UART2WB.__init__(self, platform, clk_freq) + GenSoC.__init__(self, platform, clk_freq) self.crg = _CRG(platform) + # SATA PHY and controller self.sata_phy = SATAPHY(platform.request("sata_host"), clk_freq, speed="SATA2") self.comb += self.crg.sata_reset.eq(self.sata_phy.ctrl.need_reset) self.sata_con = SATACON(self.sata_phy) + # SATA BIST generator and checker self.sata_bist = SATABIST(self.sata_con.crossbar.get_ports(2), with_control=True) - self.leds = DebugLeds(platform, self.sata_phy) + # Status Leds + self.leds = BISTLeds(platform, self.sata_phy) - if with_mila: - debug = ( - self.sata_phy.ctrl.ready, +class BISTSoCDevel(BISTSoC, AutoCSR): + csr_map = { + "mila": 11 + } + csr_map.update(BISTSoC.csr_map) + def __init__(self, platform, export_mila=False): + BISTSoC.__init__(self, platform, export_mila) - self.sata_phy.source.stb, - self.sata_phy.source.data, - self.sata_phy.source.charisk, + debug = ( + self.sata_phy.ctrl.ready, - self.sata_phy.sink.stb, - self.sata_phy.sink.data, - self.sata_phy.sink.charisk, + self.sata_phy.source.stb, + self.sata_phy.source.data, + self.sata_phy.source.charisk, - self.sata_con.command.sink.stb, - self.sata_con.command.sink.sop, - self.sata_con.command.sink.eop, - self.sata_con.command.sink.ack, - self.sata_con.command.sink.write, - self.sata_con.command.sink.read, + self.sata_phy.sink.stb, + self.sata_phy.sink.data, + self.sata_phy.sink.charisk, - self.sata_con.command.source.stb, - self.sata_con.command.source.sop, - self.sata_con.command.source.eop, - self.sata_con.command.source.ack, - self.sata_con.command.source.write, - self.sata_con.command.source.read, - self.sata_con.command.source.success, - self.sata_con.command.source.failed, - self.sata_con.command.source.data - ) + self.sata_con.command.sink.stb, + self.sata_con.command.sink.sop, + self.sata_con.command.sink.eop, + self.sata_con.command.sink.ack, + self.sata_con.command.sink.write, + self.sata_con.command.sink.read, - self.mila = MiLa(depth=2048, dat=Cat(*debug)) - self.mila.add_port(Term) - if export_mila: - mila_filename = os.path.join(platform.soc_ext_path, "test", "mila.csv") - self.mila.export(self, debug, mila_filename) + self.sata_con.command.source.stb, + self.sata_con.command.source.sop, + self.sata_con.command.source.eop, + self.sata_con.command.source.ack, + self.sata_con.command.source.write, + self.sata_con.command.source.read, + self.sata_con.command.source.success, + self.sata_con.command.source.failed, + self.sata_con.command.source.data + ) -#default_subtarget = SimDesign -default_subtarget = TestDesign \ No newline at end of file + self.mila = MiLa(depth=2048, dat=Cat(*debug)) + self.mila.add_port(Term) + if export_mila: + mila_filename = os.path.join(platform.soc_ext_path, "test", "mila.csv") + self.mila.export(self, debug, mila_filename) + +#default_subtarget = BISTSoC +default_subtarget = BISTSoCDevel