From b867db815f3f2667aed9fd88010243535f3064ab Mon Sep 17 00:00:00 2001 From: slt <37230248+foggy-slt@users.noreply.github.com> Date: Fri, 17 Sep 2021 14:02:26 +0800 Subject: [PATCH 1/2] Update fpgaflow_default_tool_path.conf Update regex for VPR --- openfpga_flow/misc/fpgaflow_default_tool_path.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openfpga_flow/misc/fpgaflow_default_tool_path.conf b/openfpga_flow/misc/fpgaflow_default_tool_path.conf index 62220e535..91108dbac 100644 --- a/openfpga_flow/misc/fpgaflow_default_tool_path.conf +++ b/openfpga_flow/misc/fpgaflow_default_tool_path.conf @@ -24,8 +24,8 @@ mult_blocks = "Netlist mult_36 blocks: ([0-9]+)", str memory_blocks = "Netlist memory blocks: ([0-9]+)", str logic_delay = "Total logic delay: ([0-9.]+)", str total_net_delay = "total net delay: ([0-9.]+)", str -total_routing_area = "Total routing area: ([0-9.]+)", str -total_logic_block_area = "Total used logic block area: ([0-9]+)", str +total_routing_area = "Total routing area: ([0-9.]+[e|E\+[0-9]+)", str +total_logic_block_area = "Total used logic block area: ([0-9.]+[e|E\+[0-9]+)", str total_wire_length = "Total wirelength: ([0-9]+)", str packing_time = "Packing took ([0-9.]+) seconds", str placement_time = "Placement took ([0-9.]+) seconds", str From f60f5b4ae52cf334f41a7ddec412ffd35331f9e9 Mon Sep 17 00:00:00 2001 From: coolbreeze413 Date: Fri, 8 Oct 2021 03:22:30 +0530 Subject: [PATCH 2/2] add wget to list of dependencies --- .github/workflows/install_dependencies_build.sh | 1 + .github/workflows/install_dependencies_run.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/install_dependencies_build.sh b/.github/workflows/install_dependencies_build.sh index 3f6ef089e..4741cf053 100644 --- a/.github/workflows/install_dependencies_build.sh +++ b/.github/workflows/install_dependencies_build.sh @@ -37,4 +37,5 @@ apt-get update && apt-get install -y \ texinfo \ time \ valgrind \ + wget \ zip diff --git a/.github/workflows/install_dependencies_run.sh b/.github/workflows/install_dependencies_run.sh index 3efb3affb..4c022ee15 100644 --- a/.github/workflows/install_dependencies_run.sh +++ b/.github/workflows/install_dependencies_run.sh @@ -1,4 +1,4 @@ apt-get install --no-install-recommends -y \ libdatetime-perl libc6 libffi6 libgcc1 libreadline7 libstdc++6 \ libtcl8.6 python3.8 python3-pip zlib1g libbz2-1.0 \ -iverilog git rsync make curl +iverilog git rsync make curl wget