Data created and destroyed every iteration

Author: Arjun Ramaswami

examples/common/helper.c

@@ -2,47 +2,48 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <math.h>
 #include "helper.h"
 
 /**
  * \brief  create random single precision complex floating point values  
  * \param  inp : pointer to float2 data of size N 
  * \param  N   : number of points in the array
- * \return 0 if successful 1 if not
+ * \return true if successful
  */
-int fftf_create_data(float2 *inp, int N){
+bool fftf_create_data(float2 *inp, int N){
 
   if(inp == NULL || N <= 0){
-    return 1;
+    return false;
   }
 
   for(int i = 0; i < N; i++){
     inp[i].x = (float)((float)rand() / (float)RAND_MAX);
     inp[i].y = (float)((float)rand() / (float)RAND_MAX);
   }
 
-  return 0;
+  return true;
 }
 
 /**
  * \brief  create random double precision complex floating point values  
  * \param  inp : pointer to double2 data of size N 
  * \param  N   : number of points in the array
- * \return 0 if successful 1 if not
+ * \return true if successful
  */
-int fft_create_data(double2 *inp, int N){
+bool fft_create_data(double2 *inp, int N){
 
   if(inp == NULL || N <= 0 || N > 1024){
-    return 1;
+    return false;
   }
 
   for(int i = 0; i < N; i++){
     inp[i].x = (double)((double)rand() / (double)RAND_MAX);
     inp[i].y = (double)((double)rand() / (double)RAND_MAX);
   }
 
-  return 0;
+  return true;
 }
 
 /**

examples/common/helper.h

@@ -3,11 +3,12 @@
 #ifndef HELPER_H
 #define HELPER_H
 
+#include <stdbool.h>
 #include "fftfpga/fftfpga.h"
 
-int fftf_create_data(float2 *inp, int N);
+bool fftf_create_data(float2 *inp, int N);
 
-int fft_create_data(double2 *inp, int N);
+bool fft_create_data(double2 *inp, int N);
 
 void print_config(int N, int dim, int iter, int inv, int sp, int use_bram);
 

examples/fft3d.c

@@ -1,8 +1,9 @@
 //  Author: Arjun Ramaswami
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <stdlib.h> // EXIT_FAILURE
 #include <math.h>
+#include <stdbool.h>
 
 #include "CL/opencl.h"
 #include "fftfpga/fftfpga.h"
@@ -23,6 +24,7 @@ int main(int argc, const char **argv) {
   fpga_t timing = {0.0, 0.0, 0.0, 0};
   int use_svm = 0, use_emulator = 0;
   double avg_rd = 0.0, avg_wr = 0.0, avg_exec = 0.0;
+  bool status = true;
 
   struct argparse_option options[] = {
     OPT_HELP(),
@@ -44,68 +46,70 @@ int main(int argc, const char **argv) {
 
   // Print to console the configuration chosen to execute during runtime
   print_config(N, dim, iter, inv, sp, use_bram);
-
-  if(fpga_initialize(platform, path, use_svm, use_emulator)){
-    return 1;
+  
+  int isInit = fpga_initialize(platform, path, use_svm, use_emulator);
+  if(isInit != 0){
+    return EXIT_FAILURE;
   }
 
   if(sp == 0){
-    fprintf(stderr, "Not implemented. Work in Progress\n");
-    return 0;
+    printf("Not implemented. Work in Progress\n");
+    return EXIT_SUCCESS;
   } 
   else{
-    size_t inp_sz = sizeof(float2) * N * N * N;
-    float2 *inp = (float2*)fftfpgaf_complex_malloc(inp_sz, use_svm);
-    float2 *out = (float2*)fftfpgaf_complex_malloc(inp_sz, use_svm);
+    for(size_t i = 0; i < iter; i++){
 
-    fftf_create_data(inp, N * N * N);
+      // create and destroy data every iteration
+      size_t inp_sz = sizeof(float2) * N * N * N;
+      float2 *inp = (float2*)fftfpgaf_complex_malloc(inp_sz, use_svm);
+      float2 *out = (float2*)fftfpgaf_complex_malloc(inp_sz, use_svm);
+
+      status = fftf_create_data(inp, N * N * N);
+      if(!status){
+        free(inp);
+        free(out);
+        return EXIT_FAILURE;
+      }
 
-    for(size_t i = 0; i < iter; i++){
       if(use_bram == 1){
+        // use bram for 3d Transpose
         timing = fftfpgaf_c2c_3d_bram(N, inp, out, inv);
       }
       else{
+        // use ddr for 3d Transpose
         timing = fftfpgaf_c2c_3d_ddr(N, inp, out, inv);
       }
 
-  #ifdef USE_FFTW
-      if(verify_sp_fft3d_fftw(out, inp, N, inv)){
-        printf("3d FFT Verification Passed \n");
+#ifdef USE_FFTW
+      if(!verify_sp_fft3d_fftw(out, inp, N, inv)){
+        fprintf(stderr, "3d FFT Verification Failed \n");
+        free(inp);
+        free(out);
+        return EXIT_FAILURE;
       }
-      else{
-        printf("3d FFT Verification Failed \n");
+#endif
+      if(timing.valid == 0){
+        fprintf(stderr, "Invalid execution, timing found to be 0");
+        free(inp);
+        free(out);
+        return EXIT_FAILURE;
       }
-  #endif
 
-      if(timing.valid != 0){
-        avg_rd += timing.pcie_read_t;
-        avg_wr += timing.pcie_write_t;
-        avg_exec += timing.exec_t;
-      }
-      else{
-        break;
-      }  
-    } 
-    free(inp);
-    free(out);
-  }
-
-  // destroy data
-  fpga_final();
+      avg_rd += timing.pcie_read_t;
+      avg_wr += timing.pcie_write_t;
+      avg_exec += timing.exec_t;
 
-  if(timing.valid == 1){
+      // destroy FFT input and output
+      free(inp);
+      free(out);
+    }  // iter
+  } // sp condition
 
-    if(avg_exec == 0.0){
-      fprintf(stderr, "Invalid measurement. Execute kernel did not run\n");
-      return 1;
-    }
+  // destroy fpga state
+  fpga_final();
 
-    display_measures(avg_rd, avg_wr, avg_exec, N, dim, iter, inv, sp);
-  }
-  else{
-    fprintf(stderr, "Invalid timing measurement. Function returned prematurely\n");
-    return 1;
-  }
+  // display performance measures
+  display_measures(avg_rd, avg_wr, avg_exec, N, dim, iter, inv, sp);
 
-  return 0;
+  return EXIT_SUCCESS;
 }