From 1e432b0ed8d55bb8dc6976d9b90a6809476ffeb9 Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Fri, 25 Aug 2023 11:32:49 +0200
Subject: [PATCH] Improve Winograd examples slighlty
---
examples/fivepointwinograddft.py | 7 +++++--
examples/threepointwinograddft.py | 23 ++++++++---------------
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/examples/fivepointwinograddft.py b/examples/fivepointwinograddft.py
index 0787445e..74051d25 100644
--- a/examples/fivepointwinograddft.py
+++ b/examples/fivepointwinograddft.py
@@ -2,6 +2,8 @@
=======================
Five-point Winograd DFT
=======================
+
+First, define the SFG/block diagram
"""
from math import cos, pi, sin
@@ -77,7 +79,8 @@ schedule = Schedule(sfg, cyclic=True)
schedule.show()
# %%
-# Reschedule to only use one AddSub and one multiplier
+# Reschedule to only use one AddSub, one Butterfly, and one ConstantMultiplication per
+# time unit
schedule.set_schedule_time(10)
schedule.move_operation('out4', 12)
@@ -161,7 +164,7 @@ memories = []
for i, mem in enumerate(mem_vars_set):
memory = Memory(mem, memory_type="RAM", entity_name=f"memory{i}")
memories.append(memory)
- mem.show(title=f"{memory.entity_name}")
+ mem.show(title=f"{memory.entity_name} variables")
memory.assign("left_edge")
memory.show_content(title=f"Assigned {memory.entity_name}")
diff --git a/examples/threepointwinograddft.py b/examples/threepointwinograddft.py
index 38338b08..aad3ddb2 100644
--- a/examples/threepointwinograddft.py
+++ b/examples/threepointwinograddft.py
@@ -57,33 +57,26 @@ sfg.set_execution_time_of_type(AddSub.type_name(), 1)
schedule = Schedule(sfg, cyclic=True)
schedule.show()
-# Reschedule to only use one AddSub and one multiplier
+# Reschedule to only use one AddSub and one ConstantMultiplication per time unit
schedule.set_schedule_time(10)
-schedule.move_operation('out1', 3)
-schedule.move_operation('out2', 4)
+schedule.move_operation('out0', 11)
+schedule.move_operation('out1', 9)
+schedule.move_operation('out2', 10)
schedule.move_operation('addsub4', 2)
schedule.move_operation('addsub3', 3)
schedule.move_operation('addsub2', 2)
schedule.move_operation('cmul1', 2)
schedule.move_operation('cmul0', 2)
-schedule.move_operation('out0', 5)
schedule.move_operation('addsub0', 3)
schedule.move_operation('addsub5', 2)
schedule.move_operation('addsub1', 2)
schedule.move_operation('in1', 1)
schedule.move_operation('in2', 2)
schedule.move_operation('cmul1', 1)
-schedule.move_operation('out2', 6)
-schedule.move_operation('out1', 6)
-schedule.move_operation('out0', 6)
schedule.move_operation('addsub5', 1)
-schedule.move_operation('addsub3', 3)
-schedule.move_operation('addsub4', 4)
-schedule.move_operation('addsub3', 1)
-schedule.move_operation('addsub4', 4)
-schedule.move_operation('cmul1', 3)
-schedule.move_operation('addsub3', 2)
-schedule.move_operation('cmul1', 3)
+schedule.move_operation('addsub3', 6)
+schedule.move_operation('addsub4', 8)
+schedule.move_operation('cmul1', 6)
schedule.move_operation('addsub2', 5)
schedule.set_schedule_time(6)
schedule.move_operation('addsub0', 1)
@@ -126,7 +119,7 @@ memories = []
for i, mem in enumerate(mem_vars_set):
memory = Memory(mem, memory_type="RAM", entity_name=f"memory{i}")
memories.append(memory)
- mem.show(title=f"{memory.entity_name}")
+ mem.show(title=f"{memory.entity_name} variables")
memory.assign("left_edge")
memory.show_content(title=f"Assigned {memory.entity_name}")
--
GitLab