X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fmontium-fft.git;a=blobdiff_plain;f=FFT.h;h=b94386e6f4e0d82bbe6f651f9aeaafc89ca930f4;hp=cb4cdf19dbf6f6a607f06bed5c49154fde593b94;hb=HEAD;hpb=e09e88b193ec1b84311b345abb2b9d7943060602

diff --git a/FFT.h b/FFT.h
index cb4cdf1..b94386e 100644
--- a/FFT.h
+++ b/FFT.h
@@ -2,24 +2,27 @@
 #ifndef FFT_H_INCLUDED
 #define FFT_H_INCLUDED
 
-#define BIT_SIZE 3
-#define SIZE (1<<BIT_SIZE)
-
+/* Define some parameters for this FFT algorithm. We prefix them 
+ * with PARAM_ so we can still use variable names like 'n' :-) */
 /* Change these: */
 /* 2log of number of tiles */
-#define q 2
+#define PARAM_q 2
 /** 2log of total FFT size */
-#define n 4
+#define PARAM_n 12
+
+/* Note that the FFT size on each tile 2^(n-q) must be at least
+ * 8 and always a multiple of 4. The number of stages on each 
+ * tile (n-q) must also be a multiple of 2. */
 
 /* But don't change these: */
 /* Number of tiles */
-#define Q (1 << q)
+#define PARAM_Q (1 << PARAM_q)
 /** Total FFT size */
-#define N (1 << n)
+#define PARAM_N (1 << PARAM_n)
 /** FFT size on each tile */
-#define N_t (N / Q)
+#define PARAM_N_t (PARAM_N / PARAM_Q)
 /** 2log of FFT size on each tile */
-#define n_t (n - q)
+#define PARAM_n_t (PARAM_n - PARAM_q)
 
 #ifndef __MONTIUMCC__
 	void pre_run();
@@ -58,7 +61,6 @@
 		mem input_a_re, input_a_im, input_b_re, input_b_im, output_a_re, output_a_im, output_b_re, output_b_im, twiddle_re, twiddle_im;
 	};
 	
-	void init();
 	INLINE struct bf_out butterfly(struct bf_in in);
 	void run(void);	
 	
@@ -73,7 +75,16 @@
 	/* Values for the cycle_odd argument */
 #define EVEN_CYCLE 0
 #define ODD_CYCLE 1
+	
+enum in_strategy {	
+	REGULAR_IN,
+	DISTRIBUTED_IN,
+};
 
+enum out_strategy {
+	REGULAR_OUT,
+	DISTRIBUTED_OUT,
+	BITREVERSED_OUT,
+};
 
-	
 #endif // !FFT_H_INCLUDED