[DAP] Use buddy-mlir library in validation framework.

Author: SForeKeeper

benchmarks/AudioProcessing/CMakeLists.txt

@@ -87,8 +87,8 @@ add_executable(audio-processing-benchmark
 target_link_directories(audio-processing-benchmark
   PRIVATE 
   ${KFR_DIR}/build/
-  ${BUDDY_MLIR_LIB_DIR}
-  )
+)
+
 target_link_libraries(audio-processing-benchmark
   PRIVATE
   kfr_io

validation/AudioProcessing/CWrapper.cpp renamed to validation/AudioProcessing/AudioValidationLib.cpp

@@ -23,7 +23,7 @@
 #include "AudioFile.h"
 
 extern "C" {
-void _mlir_ciface_conv1d_linalg(MemRef<float, 1> *inputBuddyConv1D,
+void _mlir_ciface_buddy_fir(MemRef<float, 1> *inputBuddyConv1D,
                                 MemRef<float, 1> *kernelBuddyConv1D,
                                 MemRef<float, 1> *outputBuddyConv1D);
 
@@ -35,7 +35,7 @@ float *fir(float *input, float *kernel, float *output, int inputSize,
       new MemRef<float, 1>(kernel, reinterpret_cast<intptr_t *>(&kernelSize));
   MemRef<float, 1> *out =
       new MemRef<float, 1>(output, reinterpret_cast<intptr_t *>(&outputSize));
-  _mlir_ciface_conv1d_linalg(in, ker, out);
+  _mlir_ciface_buddy_fir(in, ker, out);
   return out->getData();
 }
 

validation/AudioProcessing/CMakeLists.txt

@@ -6,20 +6,17 @@ if (NOT AUDIO_PROCESSING_BENCHMARKS)
   include_directories(${KFR_DIR}/include)
 endif()
 
-add_custom_command(OUTPUT buddy-fir.o
-  COMMAND ${BUDDY_MLIR_BUILD_DIR}/bin/buddy-opt
-  ${BUDDY_SOURCE_DIR}/benchmarks/AudioProcessing/BuddyFir.mlir
-  -lower-dap -convert-linalg-to-affine-loops
-  -lower-affine -convert-scf-to-cf -convert-vector-to-llvm
-  --llvm-request-c-wrappers -convert-arith-to-llvm
-  -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts |
-  ${LLVM_MLIR_BINARY_DIR}/mlir-translate --mlir-to-llvmir |
-  ${LLVM_MLIR_BINARY_DIR}/llc -mtriple=${BUDDY_OPT_TRIPLE}
-  -mattr=${BUDDY_OPT_ATTR} --filetype=obj
-  -o ${BUDDY_BINARY_DIR}/../validation/AudioProcessing/buddy-fir.o
-  )
-add_library(BuddyFirCor SHARED buddy-fir.o)
+add_library(AudioValidationLib SHARED AudioValidationLib.cpp)
 
-set_target_properties(BuddyFirCor PROPERTIES LINKER_LANGUAGE CXX)
+target_link_directories(AudioValidationLib
+  PRIVATE 
+  ${KFR_DIR}/build/
+  ${BUDDY_MLIR_LIB_DIR}
+)
 
-add_library(CWrapper SHARED CWrapper.cpp buddy-fir.o)
+target_link_libraries(AudioValidationLib
+  PRIVATE
+  kfr_io
+  kfr_dft
+  BuddyLibDAP
+)

validation/Python/audio/audio_file.py

@@ -36,9 +36,9 @@ class AudioFileTest(AudioTest):
             - lib: path to the library file.
 
     """
-    default_param = {"file": "../../../benchmarks/AudioProcessing/Audios/NASA_Mars.wav",
+    default_param = {"file": "../../benchmarks/AudioProcessing/Audios/NASA_Mars.wav",
                      "savefile": "./NASA_Mars_save.wav",
-                     "lib": "../../../build/utils/validation/AudioProcessing/libCWrapper"}
+                     "lib": "../../build/validation/AudioProcessing/libAudioValidationLib"}
 
     def __init__(self, test_name, test_type, test_params=default_param):
         super(AudioFileTest, self).__init__(test_name, test_type, test_params)

validation/Python/audio/fir.py

@@ -36,9 +36,9 @@ class FIRTest(AudioTest):
             - lib: path to the library file.
 
     """
-    default_param = {"file": "../../../benchmarks/AudioProcessing/Audios/NASA_Mars.wav",
+    default_param = {"file": "../../benchmarks/AudioProcessing/Audios/NASA_Mars.wav",
                      "fconf": ('kaiser', 4.0),
-                     "lib": "../../../build/utils/validation/AudioProcessing/libCWrapper"}
+                     "lib": "../../build/validation/AudioProcessing/libAudioValidationLib"}
 
     def __init__(self, test_name, test_type, test_params=default_param):
         super(FIRTest, self).__init__(test_name, test_type, test_params)
@@ -69,10 +69,10 @@ def run_file_test(self):
         input = ffi.cast("float *", ffi.from_buffer(sp_nasa))
         kernel = ffi.cast("float *", firfilt.ctypes.data)
         output = ffi.new("float[]", sp_nasa.size)
-
+        print(f"input size: {sp_nasa.size}")
         out = C.fir(input, kernel, output,
                     sp_nasa.size, firfilt.size, sp_nasa.size)
-
+        print("fir finished")
         out = ffi.unpack(out, sp_nasa.size)
 
         # scipy fir filtering

validation/Python/README.md renamed to validation/README.md

@@ -4,6 +4,9 @@
 
 ## Environment Setup
 
+Please build the "AudioValidationLib" target in CMake.
+It would generate a dynamic library for CFFI to use.
+
 Please install required packages by using:
 ```
 pip install -r requirements.txt