luke
/
icestorm
mirror of https://github.com/YosysHQ/icestorm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated 5k timing data, icetime regression fix

This commit is contained in:
David Shah 2018-01-29 14:02:37 +00:00
parent dd49c058a5
commit aa2b857d73
6 changed files with 13778 additions and 12479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
icefuzz/.gitignore vendored
View File

@ -11,3 +11,4 @@ bitdata_*.txt
data_*.txt
database_*.txt
timings_*.html
tmedges_unrenamed.tmp

9
icefuzz/icecube.sh
View File

@ -183,6 +183,10 @@ case "${ICEDEV:-hx1k-tq144}" in
iCEPACKAGE="SG48"
iCE40DEV="iCE40UP5K"
;;
up5k-uwg30)
iCEPACKAGE="UWG30"
iCE40DEV="iCE40UP5K"
;;
*)
echo "ERROR: Invalid \$ICEDEV device config '$ICEDEV'."
exit 1
@ -379,8 +383,8 @@ cat > foobar_sbt.project << EOT
Implementations=foobar_Implmnt
[foobar_Implmnt]
DeviceFamily=$( echo $iCE40DEV | sed -re 's,(HX).*,,'; )
Device=$( echo $iCE40DEV | sed -re 's,iCE40,,'; )
DeviceFamily=$( echo $iCE40DEV | sed -re 's,(HX|5K).*,,'; )
Device=$( echo $iCE40DEV | sed -re 's,iCE40(UP)?,,'; )
DevicePackage=$iCEPACKAGE
Devicevoltage=1.14
DevicevoltagePerformance=+/-5%(datasheet default)
@ -419,4 +423,3 @@ fi
export LD_LIBRARY_PATH=""
$scriptdir/../icepack/iceunpack "$1.bin" "$1.asc"

5
icefuzz/timings_loop.sh Normal file
View File

@ -0,0 +1,5 @@
while true; do
rm -rf data_5k_*.txt work_5k_*
make DEVICECLASS=5k -j3
make DEVICECLASS=5k timings
done

25295
icefuzz/timings_up5k.txt
View File

File diff suppressed because it is too large Load Diff

936
icefuzz/tmedges.txt
View File

File diff suppressed because it is too large Load Diff

11
icetime/icetime.cc
View File

@ -496,10 +496,13 @@ void read_chipdb()
if(mode == ".extra_cell") {
std::string key = std::string(tok);
int x = atoi(strtok(nullptr, " \t\r\n"));
int y = atoi(strtok(nullptr, " \t\r\n"));
std::string name = std::string(strtok(nullptr, " \t\r\n"));
extra_cells[make_tuple(cellname, tile_x, tile_y, cell_z)][key] = make_tuple(x, y, name);
if(key != "LOCKED") {
int x = atoi(strtok(nullptr, " \t\r\n"));
int y = atoi(strtok(nullptr, " \t\r\n"));
std::string name = std::string(strtok(nullptr, " \t\r\n"));
extra_cells[make_tuple(cellname, tile_x, tile_y, cell_z)][key] = make_tuple(x, y, name);
}
}
}