X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=FFT.h;h=b94386e6f4e0d82bbe6f651f9aeaafc89ca930f4;hb=0d35b7f16985392b1cd2d312fbdca51dc3084bcc;hp=07f3948d80f41eca06cb462c7d5c4b050824e448;hpb=6599667fbc3945f5a32569832a79c543aa233d44;p=matthijs%2Fprojects%2Fmontium-fft.git

diff --git a/FFT.h b/FFT.h
index 07f3948..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();
@@ -72,5 +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