From 4578b15e2ec553c6dc4beaefc55f69737bbbb9ed Mon Sep 17 00:00:00 2001
From: Russel Arbore <russel.jma@gmail.com>
Date: Wed, 5 Mar 2025 22:23:10 -0600
Subject: [PATCH] revert cava schedules
---
juno_samples/cava/src/cpu.sch | 10 ++++------
juno_samples/cava/src/gpu.sch | 32 ++++++++++++--------------------
2 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/juno_samples/cava/src/cpu.sch b/juno_samples/cava/src/cpu.sch
index 7d788c2f..32e2b63b 100644
--- a/juno_samples/cava/src/cpu.sch
+++ b/juno_samples/cava/src/cpu.sch
@@ -111,15 +111,11 @@ fixpoint {
fork-fusion(fuse4@channel_loop);
}
simpl!(fuse4);
-
-if !feature("dont_fuse_gamut") {
- array-slf(fuse4);
- simpl!(fuse4);
-}
+array-slf(fuse4);
+simpl!(fuse4);
if !feature("seq") {
let par = fuse4@image_loop \ fuse4@channel_loop;
- let par = par \ fuse4@cp_loop;
fork-tile[4, 1, false, false](par);
fork-tile[8, 0, false, false](par);
fork-interchange[1, 2](par);
@@ -128,6 +124,8 @@ if !feature("seq") {
fork-coalesce(fuse4, fuse4_body);
simpl!(fuse4, fuse4_body);
fuse4 = fuse4_body;
+} else {
+ fork-tile[6, 0, false, true](fuse4@channel_loop);
}
no-memset(fuse5@res1);
diff --git a/juno_samples/cava/src/gpu.sch b/juno_samples/cava/src/gpu.sch
index daf52339..0ef466c0 100644
--- a/juno_samples/cava/src/gpu.sch
+++ b/juno_samples/cava/src/gpu.sch
@@ -115,25 +115,12 @@ fixpoint {
fork-fusion(fuse4@channel_loop);
}
simpl!(fuse4);
-
-if !feature("dont_fuse_gamut") {
- array-slf(fuse4);
- simpl!(fuse4);
- fork-tile[2, 0, false, true](fuse4@channel_loop);
- let out = fork-split(fuse4@channel_loop);
- fork-unroll(out.cava_3.fj1);
- unforkify(fuse4@channel_loop);
-}
-
-let par = fuse4@image_loop \ fuse4@channel_loop;
-let par = par \ fuse4@cp_loop;
-
-fork-tile[4, 1, false, true](par);
-fork-tile[8, 0, false, true](par);
-fork-interchange[1, 2](par);
-let split = fork-split(par);
-fork-coalesce(split.cava_3.fj0 \ split.cava_3.fj2);
-fork-coalesce(split.cava_3.fj2);
+array-slf(fuse4);
+simpl!(fuse4);
+fork-tile[2, 0, false, true](fuse4@channel_loop);
+let out = fork-split(fuse4@channel_loop);
+fork-unroll(out.cava_3.fj1);
+unforkify(fuse4@channel_loop);
no-memset(fuse5@res1);
no-memset(fuse5@res2);
@@ -146,7 +133,12 @@ simpl!(fuse5);
array-slf(fuse5);
simpl!(fuse5);
-
+fork-tile[4, 1, false, true](fuse4);
+fork-tile[8, 0, false, true](fuse4);
+fork-interchange[1, 2](fuse4);
+let split = fork-split(fuse4);
+fork-coalesce(split.cava_3.fj0 \ split.cava_3.fj2);
+fork-coalesce(split.cava_3.fj2);
delete-uncalled(*);
simpl!(*);
--
GitLab