Skip to content

Commit

Permalink
small bug fixes and seq-ed benchmarks
Browse files Browse the repository at this point in the history
  • Loading branch information
ayakayorihiro committed Sep 10, 2024
1 parent 898aade commit 91700c9
Show file tree
Hide file tree
Showing 48 changed files with 25,759 additions and 4 deletions.
4 changes: 2 additions & 2 deletions tools/profiler/get-profile-counts-info.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ echo "[${SCRIPT_NAME}] Obtaining FSM info from TDCC"
(
cd ${CALYX_DIR}
set -o xtrace
cargo run -- ${INPUT_FILE} -p no-opt -x tdcc:dump-fsm-json="${FSM_JSON}"
cargo run -- ${INPUT_FILE} -p compile-repeat -p no-opt -x tdcc:dump-fsm-json="${FSM_JSON}"
set +o xtrace
) &> ${LOGS_DIR}/gol-tdcc

Expand All @@ -69,7 +69,7 @@ echo "[${SCRIPT_NAME}] Obtaining cell information from component-cells backend"
echo "[${SCRIPT_NAME}] Obtaining VCD file via simulation"
(
set -o xtrace
fud2 ${INPUT_FILE} -o ${VCD_FILE} --through verilator -s calyx.args='-p no-opt' -s sim.data=${SIM_DATA_JSON}
fud2 ${INPUT_FILE} -o ${VCD_FILE} --through verilator -s calyx.args='-p compile-repeat -p no-opt' -s sim.data=${SIM_DATA_JSON}
set +o xtrace
) &> ${LOGS_DIR}/gol-vcd

Expand Down
6 changes: 4 additions & 2 deletions tools/profiler/parse-vcd.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,13 +218,15 @@ def postprocess(self):
# TDCC groups need to be recorded (before FSMs) for tracking FSM values
# (ex. if the FSM has value 0 but the TDCC group isn't active, then the group represented by the
# FSM's 0 value should not be considered as active)
for tdcc_event in filter(lambda e : "tdcc_go" in e["signal"], events):
for tdcc_event in filter(lambda e : "tdcc" in e["signal"] and "go" in e["signal"], events):
tdcc_group = "_".join(tdcc_event["signal"].split("_")[0:-1])
if self.tdcc_group_active_cycle[tdcc_group] == -1 and tdcc_event["value"] == 1: # value changed to 1
self.tdcc_group_active_cycle[tdcc_group] = clock_cycles
for fsm in self.tdcc_group_to_dep_fsms[tdcc_group]:
value = fsm_to_curr_value[fsm]
if value != -1:
if value not in self.fsms[fsm]:
continue
next_group = f"{self.fsms[fsm][value]}FSM"
fsm_to_active_group[fsm] = next_group
self.profiling_info[next_group].start_new_segment(clock_cycles)
Expand All @@ -233,7 +235,7 @@ def postprocess(self):
for event in events:
signal_name = event["signal"]
value = event["value"]
if "tdcc_go" in signal_name: # skip all tdcc events since we've already processed them
if "tdcc" in signal_name and "go" in signal_name: # skip all tdcc events since we've already processed them
continue
if signal_name.endswith(".go") and value == 1: # cells have .go and .done
cell = signal_name.split(".go")[0]
Expand Down
Loading

0 comments on commit 91700c9

Please sign in to comment.