* Add a missing ! in write_output_regular().

[matthijs/projects/montium-fft.git] / FFT.mc

diff --git a/FFT.mc b/FFT.mc
index 3ad081668c51b058cece7d041f772a5c415ad94c..6688275a9f32d7a7341ead36d3859efe18578e57 100644 (file)
--- a/FFT.mc
+++ b/FFT.mc
@@ -6,6 +6,7 @@
 \r
 #include "FFT.h"\r
 \r
+int stage = 1;\r
 /**\r
  * Executes a single butterfly on ALU 0-3. The inputs are the words taken from\r
  * in, which will be read on various inputs of ALU 0-3. Outputs will be\r
@@ -51,7 +52,7 @@ INLINE void write_output_regular(struct mems m, struct bf_out res, bool second_h
        add_offset(m.output_b_re, 2);\r
        add_offset(m.output_b_im, 2);\r
        \r
-       if (second_half) {\r
+       if (!second_half) {\r
                write_mem(m.output_a_re, res.a_re);\r
                write_mem(m.output_a_im, res.a_im);\r
                write_mem(m.output_b_re, res.b_re);\r
@@ -98,7 +99,13 @@ INLINE struct bf_in read_input_regular(struct mems m, bool cycle_odd, bool stage
        add_offset(m.input_a_im, 1);\r
        add_offset(m.input_b_re, 1);\r
        add_offset(m.input_b_im, 1);\r
-       /* TODO: Update twiddle offsets */\r
+       \r
+       /* TODO: Is this true? */\r
+       add_offset(m.twiddle_re, (PARAM_N_t>>stage));\r
+       add_offset(m.twiddle_im, (PARAM_N_t>>stage));\r
+       use_mask(m.twiddle_re, (PARAM_N_t/2)-1);\r
+       use_mask(m.twiddle_im, (PARAM_N_t/2)-1);\r
+\r
        return in;\r
 }\r
 \r
@@ -180,9 +187,9 @@ INLINE void do_half_regular_stage(struct mems m, bool stage_odd, bool second_hal
 \r
        /* Now, do half a single stage. That means N_t / 4 cycles. Since we do 2\r
         * cycles on every iteration, plus one before and after the loop,\r
-        * we will loop N_t / 8 - 1 times. */\r
+        * we will loop N_t / 8 - 1 times. We add an extra - 1 because this is a do while loop... */\r
        init_loop(LC2, (PARAM_N_t / 8) - 1);\r
-       do {\r
+       while (loop_next(LC2)) {\r
                /* Write outputs of previous cycle */\r
                write_output_regular(m, out, second_half);\r
 \r
@@ -197,7 +204,7 @@ INLINE void do_half_regular_stage(struct mems m, bool stage_odd, bool second_hal
                /* Even cycle */\r
                in = read_input_regular(m, EVEN_CYCLE, second_half);\r
                out = butterfly(in);\r
-       } while (loop_next(LC2));\r
+       }\r
        \r
        /* Write outputs of previous cycle */\r
        write_output_regular(m, out, second_half);\r
@@ -249,18 +256,20 @@ void run() {
        /* We need to do n_t regular stages. Since we do two stages each\r
         * iteration, we'll do n_t / 2 iterations. */\r
        init_loop(LC1, (PARAM_n_t / 2));\r
-       do {\r
+       while (loop_next(LC1)) {\r
                m = init_mem_mapping(EVEN_STAGE);\r
                init_input_addresses_regular(m, EVEN_STAGE);\r
                /* do_half_regular_stage will init output addresses */\r
                next_cycle();\r
                do_half_regular_stage(m, EVEN_STAGE, FIRST_HALF);\r
                do_half_regular_stage(m, EVEN_STAGE, SECOND_HALF);\r
+               stage++;\r
                next_cycle();\r
                init_input_addresses_regular(m, ODD_STAGE);\r
                m = init_mem_mapping(ODD_STAGE);\r
                next_cycle();\r
                do_half_regular_stage(m, ODD_STAGE, FIRST_HALF);\r
                do_half_regular_stage(m, ODD_STAGE, SECOND_HALF);\r
-       } while (loop_next(LC1));\r
+               stage++;\r
+       }\r
 }\r