Fixed include dependencies in EmitHLS.cc as well as syntax errors due to porting from newer LLVM version

Author: Fiwo735

Makefile

@@ -20,7 +20,7 @@ test-example:
 	python3 scripts/pb-flow.py ./example/polybench -e $(example) --work-dir ./tmp/phism/pb-flow.tmp --cosim
 
 test-emit:
-	python3 scripts/pb-flow.py ./example/polybench -e 2mm --work-dir ./tmp/phism/pb-flow.tmp --skip-vitis --emit-HLS
+	python3 scripts/pb-flow.py ./example/polybench -e 2mm --work-dir ./tmp/phism/pb-flow.tmp --skip-vitis --emit-hls
 
 # Evaluate polybench (baseline) - need to be used in environment
 test-polybench:

emitHLS_test.mlir

@@ -0,0 +1,58 @@
+// RUN: mase-opt %s --emit-hls="hls-param=data_in,,in,,fixed,,(1,100),,(8,5);data_out,,out,,fixed,,(1,100),,(8,5);" | FileCheck %s
+
+// CHECK: // =====================================
+// CHECK-NEXT: // Mase HLS Hardware 
+// CHECK-NEXT: // Model: relu 
+// CHECK-NEXT: // ===================================== 
+// CHECK-NEXT: #include <algorithm>
+// CHECK-NEXT: #include <ap_axi_sdata.h>
+// CHECK-NEXT: #include <ap_fixed.h>
+// CHECK-NEXT: #include <ap_int.h>
+// CHECK-NEXT: #include <hls_math.h>
+// CHECK-NEXT: #include <hls_stream.h>
+// CHECK-NEXT: #include <math.h>
+// CHECK-NEXT: #include <stdint.h>
+// CHECK-NEXT: #include <string.h>
+// CHECK-NEXT: using namespace std;
+// CHECK: void relu(ap_fixed<8, 5> data_in[1][100],ap_fixed<8, 5> data_out[1][100]) { 
+// CHECK-NEXT: ap_fixed<8, 5> v0 = 0.000000; 
+// CHECK-NEXT: ap_fixed<8, 5> v1; 
+// CHECK-NEXT: bool v2; 
+// CHECK-NEXT: ap_fixed<8, 5> v3; 
+// CHECK-NEXT: b0: 
+// CHECK-NEXT: for (int v4 = 0; v4 < 1; v4 += 1) {b1: 
+// CHECK-NEXT: for (int v5 = 0; v5 < 100; v5 += 1) {b2: 
+// CHECK-NEXT: v1 = data_in[0][v5]; 
+// CHECK-NEXT: v2 = v1 > v0; 
+// CHECK-NEXT: v3 = v2 ? v1 : v0; 
+// CHECK-NEXT: data_out[v4][v5] = v3; 
+// CHECK-NEXT: } 
+// CHECK-NEXT: } 
+// CHECK-NEXT: } 
+// CHECK-NEXT: module { 
+// CHECK-NEXT:  func.func @relu(%arg0: memref<1x100xf32>, %arg1: memref<1x100xf32>) { 
+// CHECK-NEXT:    %cst = arith.constant 0.000000e+00 : f32 
+// CHECK-NEXT:    affine.for %arg2 = 0 to 1 { 
+// CHECK-NEXT:      affine.for %arg3 = 0 to 100 { 
+// CHECK-NEXT:        %0 = affine.load %arg0[0, %arg3] : memref<1x100xf32>
+// CHECK-NEXT:        %1 = arith.cmpf ugt, %0, %cst : f32 
+// CHECK-NEXT:        %2 = arith.select %1, %0, %cst : f32 
+// CHECK-NEXT:        affine.store %2, %arg1[%arg2, %arg3] : memref<1x100xf32>
+// CHECK-NEXT:      } 
+// CHECK-NEXT:    } 
+// CHECK-NEXT:    return 
+// CHECK-NEXT:  } 
+// CHECK-NEXT: }
+
+func @relu(%arg0: memref<1x100xf32>, %arg1: memref<1x100xf32>) {
+  %cst = arith.constant 0.000000e+00 : f32
+  affine.for %arg2 = 0 to 1 {
+    affine.for %arg3 = 0 to 100 {
+      %0 = affine.load %arg0[0, %arg3] : memref<1x100xf32>
+      %1 = arith.cmpf ugt, %0, %cst : f32
+      %2 = select %1, %0, %cst : f32
+      affine.store %2, %arg1[%arg2, %arg3] : memref<1x100xf32>
+    }
+  }
+  return
+}

include/phism/mlir/Transforms/Passes.h

@@ -24,7 +24,6 @@ std::unique_ptr<mlir::OperationPass<mlir::FuncOp>> createLoadSwitchPass();
 std::unique_ptr<mlir::OperationPass<mlir::ModuleOp>> createLiftMemRefSubviewPass();
 std::unique_ptr<mlir::OperationPass<mlir::ModuleOp>> createSCoPDecompositionPass();
 std::unique_ptr<mlir::OperationPass<mlir::ModuleOp>> createInlineSCoPAffinePass();
-// TODO ModuleOp, FuncOp or just Pass?
 std::unique_ptr<mlir::OperationPass<mlir::ModuleOp>> createEmitHLSPass();
 
 /// Generate the code for registering passes.

include/phism/mlir/Transforms/Passes.td

@@ -130,10 +130,16 @@ def InlineSCoPAffine : Pass<"inline-scop-affine", "::mlir::ModuleOp"> {
   ];
 }
 
-def EmitHLS : FunctionPass<"emit-HLS"> {
-  let summary = "Raise MLIR to HLS C/C++.";
+def EmitHLSPass : Pass<"emit-hls", "::mlir::ModuleOp"> {
+  let summary = "Emit HLS code from MLIR";
+  let description = [{ 
+    Emit HLS code for the given program. It could be either default implementation of traditional HLS hardware,
+    or a dataflow architecture by bufferizing the inputs and outputs.
+  }];
   let constructor = "phism::createEmitHLSPass()";
   let options = [
+    Option<"fileName", "file-name", "std::string", /*default=*/"", "The output HLS code">,
+    Option<"hlsParam", "hls-param", "std::string", /*default=*/"", "The HLS parameters for quantization">
   ];
 }
 

include/phism/mlir/Transforms/PhismTransforms.h

@@ -14,6 +14,7 @@ void registerLoopTransformPasses();
 void registerFoldIfPasses();
 void registerAllPhismPasses();
 // void registerDependenceAnalysisPasses();
+void registerEmitHLSPass();
 } // namespace phism
 
 #endif

lib/mlir/Transforms/CMakeLists.txt

@@ -13,6 +13,7 @@ add_mlir_library(PhismTransforms
   LiftMemRefSubview.cc
   SCoPDecomposition.cc
   LoadSwitch.cc
+  EmitHLS.cc
   Utils.cc
 
   ADDITIONAL_HEADER_DIRS
@@ -31,4 +32,9 @@ add_mlir_library(PhismTransforms
   MLIRStandard
   MLIRSupport
   MLIRAffineToStandard
+  MLIRLinalgAnalysis
+  MLIRLinalg
+  MLIRLinalgTransforms
+  MLIRLinalgUtils
+  MLIRSCF
 )