From a640c7e87b0891402c5e51d8b96cac91d6ab1570 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Wed, 3 Apr 2019 18:26:56 +0100 Subject: Add quick fix to run without dsp48 --- src/VeriFuzz/Sim/Vivado.hs | 3 ++- src/VeriFuzz/Sim/XST.hs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/VeriFuzz/Sim') diff --git a/src/VeriFuzz/Sim/Vivado.hs b/src/VeriFuzz/Sim/Vivado.hs index fef0c83..0bfbd11 100644 --- a/src/VeriFuzz/Sim/Vivado.hs +++ b/src/VeriFuzz/Sim/Vivado.hs @@ -39,10 +39,11 @@ runSynthVivado sim (SourceInfo top src) outf = do dir <- pwd writefile vivadoTcl . vivadoSynthConfig top $ toTextIgnore outf writefile "rtl.v" $ genSource src + run_ "sed" ["s/^module/(* use_dsp48=\"no\" *) module/;", "-i", "rtl.v"] echoP "Vivado: run" logger_ dir "vivado" $ timeout (vivadoPath sim) ["-mode", "batch", "-source", toTextIgnore vivadoTcl] echoP "Vivado: done" - where vivadoTcl = "vivado_" <> fromText top <.> "tcl" + where vivadoTcl = fromText ("vivado_" <> top) <.> "tcl" diff --git a/src/VeriFuzz/Sim/XST.hs b/src/VeriFuzz/Sim/XST.hs index 9019db8..026f5e7 100644 --- a/src/VeriFuzz/Sim/XST.hs +++ b/src/VeriFuzz/Sim/XST.hs @@ -65,6 +65,6 @@ runSynthXST sim (SourceInfo top src) outf = do ] echoP "XST: done" where - modFile = "xst_" <> fromText top + modFile = fromText $ "xst_" <> top xstFile = modFile <.> "xst" prjFile = modFile <.> "prj" -- cgit