Remove explicit AIENGINE and AIEARCH defines from kernels (#1982)

Xilinx · Dec 17, 2024 · 066e514 · 066e514
1 parent aa6d84e
commit 066e514
Show file tree

Hide file tree

Showing 18 changed files with 1 addition and 35 deletions.
diff --git a/aie_kernels/aie2/add.cc b/aie_kernels/aie2/add.cc
@@ -8,9 +8,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define __AIENGINE__ 2
 #define NOCPP
-#define __AIEARCH__ 20
 
 #include <stdint.h>
 #include <stdio.h>

diff --git a/aie_kernels/aie2/addWeighted.cc b/aie_kernels/aie2/addWeighted.cc
@@ -9,7 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-// #define __AIENGINE__ 1
 #define NOCPP
 
 #include <stdint.h>

diff --git a/aie_kernels/aie2/bitwiseAND.cc b/aie_kernels/aie2/bitwiseAND.cc
@@ -8,7 +8,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-// #define __AIENGINE__ 1
 #define NOCPP
 
 #include <stdint.h>

diff --git a/aie_kernels/aie2/bitwiseOR.cc b/aie_kernels/aie2/bitwiseOR.cc
@@ -8,7 +8,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-// #define __AIENGINE__ 1
 #define NOCPP
 
 #include <stdint.h>

diff --git a/aie_kernels/aie2/cascade_mm.cc b/aie_kernels/aie2/cascade_mm.cc
@@ -8,9 +8,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define __AIENGINE__ 2
 #define NOCPP
-#define __AIEARCH__ 20
 
 #include <stdint.h>
 #include <stdio.h>

diff --git a/aie_kernels/aie2/conv2dk1.cc b/aie_kernels/aie2/conv2dk1.cc
@@ -9,10 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// #define __AIENGINE__ 1
-#define __AIENGINE__ 2
 #define NOCPP
-#define __AIEARCH__ 20
 
 #include <stdint.h>
 #include <stdio.h>

diff --git a/aie_kernels/aie2/conv2dk1_i8.cc b/aie_kernels/aie2/conv2dk1_i8.cc
@@ -9,10 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// #define __AIENGINE__ 1
-#define __AIENGINE__ 2
 #define NOCPP
-#define __AIEARCH__ 20
 
 #include <stdint.h>
 #include <stdio.h>

diff --git a/aie_kernels/aie2/conv2dk1_skip.cc b/aie_kernels/aie2/conv2dk1_skip.cc
@@ -9,10 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// #define __AIENGINE__ 1
-#define __AIENGINE__ 2
 #define NOCPP
-#define __AIEARCH__ 20
 
 #include <stdint.h>
 #include <stdio.h>

diff --git a/aie_kernels/aie2/conv2dk1_skip_init.cc b/aie_kernels/aie2/conv2dk1_skip_init.cc
@@ -10,10 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// #define __AIENGINE__ 1
-#define __AIENGINE__ 2
 #define NOCPP
-#define __AIEARCH__ 20
 
 #include <stdint.h>
 #include <stdio.h>

diff --git a/aie_kernels/aie2/conv2dk3.cc b/aie_kernels/aie2/conv2dk3.cc
@@ -9,10 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// #define __AIENGINE__ 1
-#define __AIENGINE__ 2
 #define NOCPP
-#define __AIEARCH__ 20
 
 #include <stdint.h>
 #include <stdio.h>

diff --git a/aie_kernels/aie2/filter2d.cc b/aie_kernels/aie2/filter2d.cc
@@ -8,7 +8,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-// #define __AIENGINE__ 1
 #define NOCPP
 
 #include <stdint.h>

diff --git a/aie_kernels/aie2/mm.cc b/aie_kernels/aie2/mm.cc
@@ -8,9 +8,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define __AIENGINE__ 2
 #define NOCPP
-#define __AIEARCH__ 20
 
 #include <stdint.h>
 #include <stdio.h>

diff --git a/aie_kernels/aie2/mm_b_col_maj.cc b/aie_kernels/aie2/mm_b_col_maj.cc
@@ -12,9 +12,7 @@
 // transposed B matrix (or, equivalently, a B matrix that is stored in column-
 // major format). A remains row-major.
 
-#define __AIENGINE__ 2
 #define NOCPP
-#define __AIEARCH__ 20
 
 #include <stdint.h>
 #include <stdio.h>

diff --git a/aie_kernels/aie2/mv.cc b/aie_kernels/aie2/mv.cc
@@ -8,9 +8,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define __AIENGINE__ 2
 #define NOCPP
-#define __AIEARCH__ 20
 
 #include <stdint.h>
 #include <stdio.h>

diff --git a/aie_kernels/aie2/relu.cc b/aie_kernels/aie2/relu.cc
@@ -8,9 +8,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define __AIENGINE__ 2
 #define NOCPP
-#define __AIEARCH__ 20
 
 #include <stdint.h>
 #include <stdio.h>

diff --git a/aie_kernels/aie2/threshold.cc b/aie_kernels/aie2/threshold.cc
@@ -9,7 +9,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-// #define __AIENGINE__ 1
 #define NOCPP
 
 #include <stdint.h>

diff --git a/programming_examples/makefile-common b/programming_examples/makefile-common
@@ -8,7 +8,7 @@ AIEOPT_DIR ?= $(shell realpath $(dir $(shell which aie-opt))/..)
 WARNING_FLAGS = -Wno-parentheses -Wno-attributes -Wno-macro-redefined
 
 CHESSCC1_FLAGS = -f -p me -P ${AIE_INCLUDE_DIR} -I ${AIETOOLS_DIR}/include
-CHESSCC2_FLAGS = -f -p me -P ${AIE2_INCLUDE_DIR} -I ${AIETOOLS_DIR}/include -D__AIENGINE__=2 -D__AIEARCH__=20
+CHESSCC2_FLAGS = -f -p me -P ${AIE2_INCLUDE_DIR} -I ${AIETOOLS_DIR}/include
 CHESS_FLAGS = -P ${AIE_INCLUDE_DIR}
 
 CHESSCCWRAP1_FLAGS = aie -I ${AIETOOLS_DIR}/include 

diff --git a/programming_examples/ml/softmax/softmax.cc b/programming_examples/ml/softmax/softmax.cc
@@ -8,9 +8,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define __AIENGINE__ 2
 #define NOCPP
-#define __AIEARCH__ 20
 
 #include <stdint.h>
 #include <stdio.h>