X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fmontium-fft.git;a=blobdiff_plain;f=FFT_support.cpp;fp=FFT_support.cpp;h=2ddf150b6f1bb8e3e215dac89d9256cbb4fe31cd;hp=7fc2484be97043c091505e99354a165015e2e2a1;hb=28a18d3e2fa2fd883b08b2bffca19309be1db140;hpb=8a8fdd8103c465b3090dfb8b7b90a1f8b8632ed8

diff --git a/FFT_support.cpp b/FFT_support.cpp
index 7fc2484..2ddf150 100644
--- a/FFT_support.cpp
+++ b/FFT_support.cpp
@@ -6,7 +6,7 @@
 #define FIXED_POINT 15
 #define WORD_SIZE   16
 
-#define WORDS_PER_LINE 8
+#define WORDS_PER_LINE 4
 #define WORDS_PER_GROUP 1
 
 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; 
@@ -27,7 +27,7 @@ float from_fixed(int n)
 	return n / (float)(1<<FIXED_POINT);
 }
 
-void print_mem(mem m, int offset, int size, bool fixed)
+void print_mem(mem m, int offset, int size, bool fixed, bool newline)
 {
 	int i;
 	for(i = offset;i<offset+size;i++)
@@ -36,12 +36,12 @@ void print_mem(mem m, int offset, int size, bool fixed)
 			printf("%0.4f", from_fixed(get_mem(m->id, i)));
 		else
 			printf("%04hx", (short)get_mem(m->id, i));
-		if ((i + 1) % WORDS_PER_LINE == 0)
+		if (newline && (i + 1) % WORDS_PER_LINE == 0)
 			printf("\n");
 		else if ((i + 1) % WORDS_PER_GROUP == 0)
 			printf(" ");
 	}
-	if (i % WORDS_PER_LINE != 0)
+	if (newline && i % WORDS_PER_LINE != 0)
 		printf("\n");
 }
 
@@ -67,9 +67,9 @@ void pre_run()
 	
 	for (i=0;i<PARAM_N_t;i++)
 	{
-		/* We take the sine from 0 to 2*2*Pi, ie two periods. We divide 
+		/* We take the sine from 0 to 20*2*Pi, ie twenty periods. We divide 
 		 * the value by PARAM_N_t to prevent overflow. */
-		int value = to_fixed(sin((float)i*2*2*M_PI/PARAM_N_t)/PARAM_N_t);
+		int value = to_fixed(sin((float)i*20*2*M_PI/PARAM_N_t)/PARAM_N_t);
 
 		if (i<PARAM_N_t/2)
 		{
@@ -94,14 +94,19 @@ void pre_run()
 	}
 	
 	printf("re(W)\n");
-	print_mem(twiddle_re, 0, PARAM_N_t/2, true);
+	print_mem(twiddle_re, 0, PARAM_N_t/2, true, true);
 	printf("im(W)\n");
-	print_mem(twiddle_im, 0, PARAM_N_t/2, true);
+	print_mem(twiddle_im, 0, PARAM_N_t/2, true, true);
 	printf("re(in_a)\n");
-	print_mem(input_a_re, 0, PARAM_N_t/2, true);
+	print_mem(input_a_re, 0, PARAM_N_t/2, true, true);
 	printf("re(in_b)\n");
-	print_mem(input_b_re, 0, PARAM_N_t/2, true);
-	
+	print_mem(input_b_re, 0, PARAM_N_t/2, true, true);
+
+	printf("re_in = [");
+	print_mem(input_a_re, 0, PARAM_N_t/2, true, false);
+	print_mem(input_b_re, 0, PARAM_N_t/2, true, false);
+	printf("];\n");
+
 /* Write out memory contents for use by the python simulator */
 	save_mem_range_to_file(input_a_re->id, 0, PARAM_N_t/2, "Memory/sin_a_re.mm");
 	save_mem_range_to_file(input_a_im->id, 0, PARAM_N_t/2, "Memory/sin_a_im.mm");
@@ -126,18 +131,21 @@ void post_run()
 		output_b_re  = alloc_mem(P2M1);
 		output_b_im  = alloc_mem(P3M1);
 	}
+	printf("re_out = [");
+	print_mem(output_a_re, 0, PARAM_N_t/2, true, false);
+	print_mem(output_b_re, 0, PARAM_N_t/2, true, false);
+	printf("];\n");
+	printf("im_out = [");
+	print_mem(output_a_im, 0, PARAM_N_t/2, true, false);
+	print_mem(output_b_im, 0, PARAM_N_t/2, true, false);
+	printf("];\n");
+	/*
 	printf("re(out)\n");
-	print_mem(output_a_re, 0, PARAM_N_t/2, true);
-	print_mem(output_b_re, 0, PARAM_N_t/2, true);
-	printf("im(out)\n");
-	print_mem(output_a_im, 0, PARAM_N_t/2, true);
-	print_mem(output_b_im, 0, PARAM_N_t/2, true);
-	
-	printf("re(out)\n");
-	print_mem(output_a_re, 0, PARAM_N_t/2, false);
-	print_mem(output_b_re, 0, PARAM_N_t/2, false);
+	print_mem(output_a_re, 0, PARAM_N_t/2, false, true);
+	print_mem(output_b_re, 0, PARAM_N_t/2, false, true);
 	printf("im(out)\n");
-	print_mem(output_a_im, 0, PARAM_N_t/2, false);
-	print_mem(output_b_im, 0, PARAM_N_t/2, false);
+	print_mem(output_a_im, 0, PARAM_N_t/2, false, true);
+	print_mem(output_b_im, 0, PARAM_N_t/2, false, true);
+	*/
 
 }