Some code cleanup (#164)

Author: Hardcode84

CMakeLists.txt

@@ -76,9 +76,9 @@ endif()
 
 add_subdirectory(mlir)
 add_subdirectory(dpcomp_runtime)
+add_subdirectory(tools)
 
 if(NUMBA_ENABLE)
-    add_subdirectory(tools)
     add_subdirectory(numba_dpcomp)
 endif()
 

dpcomp_gpu_runtime/lib/kernel_api_stubs.cpp

@@ -15,8 +15,6 @@
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
-#include <mutex>
-#include <numeric>
 
 #include "dpcomp-gpu-runtime_export.h"
 

dpcomp_runtime/CMakeLists.txt

@@ -22,21 +22,13 @@ endif()
 
 find_package(MLIR REQUIRED CONFIG)
 
-if(TBB_ENABLE)
-    set(SOURCES_LIST
-        lib/context.cpp
-        lib/tbb_parallel.cpp
-        lib/memory.cpp
-        )
-    set(HEADERS_LIST
-        )
-else()
-    set(SOURCES_LIST
-        lib/memory.cpp
-        )   
-    set(HEADERS_LIST
-        )        
-endif()
+set(SOURCES_LIST
+    lib/context.cpp
+    lib/tbb_parallel.cpp
+    lib/memory.cpp
+    )
+set(HEADERS_LIST
+    )
 
 add_library(${PROJECT_NAME} SHARED ${SOURCES_LIST} ${HEADERS_LIST})
 generate_export_header(${PROJECT_NAME})
@@ -46,6 +38,8 @@ target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE
     PRIVATE
     ${PROJECT_BINARY_DIR}
     )
+
 if(TBB_ENABLE)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE TBB_ENABLE=1)
     target_link_libraries(${PROJECT_NAME} TBB::tbb)
-endif()
+endif()

dpcomp_runtime/lib/tbb_parallel.cpp

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifdef TBB_ENABLE
+
 #include <array>
 #include <cassert>
 #include <cstdio>
@@ -227,18 +229,18 @@ DPCOMP_RUNTIME_EXPORT void dpcompParallelFor(const InputRange *input_ranges,
 }
 
 DPCOMP_RUNTIME_EXPORT void dpcompParallelInit(int numThreads) {
-  if (DEBUG) {
+  if (DEBUG)
     fprintf(stderr, "dpcomp_parallel_init %d\n", numThreads);
-  }
-  if (nullptr == globalContext) {
+
+  if (nullptr == globalContext)
     globalContext = std::make_unique<TBBContext>(numThreads);
-  }
 }
 
 DPCOMP_RUNTIME_EXPORT void dpcompParallelFinalize() {
-  if (DEBUG) {
+  if (DEBUG)
     fprintf(stderr, "dpcomp_parallel_finalize\n");
-  }
+
   globalContext.reset();
 }
 }
+#endif // TBB_ENABLE

mlir/include/mlir-extensions/Conversion/gpu_to_gpu_runtime.hpp

@@ -17,6 +17,7 @@
 #include "mlir-extensions/dialect/gpu_runtime/IR/gpu_runtime_ops.hpp"
 
 #include "mlir/Conversion/ControlFlowToSPIRV/ControlFlowToSPIRV.h"
+#include <llvm/ADT/SmallBitVector.h>
 #include <mlir/Analysis/BufferViewFlowAnalysis.h>
 #include <mlir/Conversion/AffineToStandard/AffineToStandard.h>
 #include <mlir/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.h>
@@ -46,8 +47,6 @@
 #include <mlir/Transforms/DialectConversion.h>
 #include <mlir/Transforms/GreedyPatternRewriteDriver.h>
 #include <mlir/Transforms/Passes.h>
-#include <llvm/ADT/SmallBitVector.h>
-
 
 namespace gpu_runtime {
 

mlir/lib/dialect/gpu_runtime/IR/gpu_runtime_ops.cpp

@@ -285,4 +285,3 @@ mlir::StringAttr GPUSuggestBlockSizeOp::getKernelName() {
 
 #define GET_OP_CLASSES
 #include "mlir-extensions/dialect/gpu_runtime/IR/GpuRuntimeOps.cpp.inc"
-

test/Conversion/LowerToLevelZero/addf.mlir

@@ -1,3 +1,4 @@
+// REQUIRES: run-gpu-tests
 // RUN: mlir-vulkan-runner %s --shared-libs=%vulkan_wrapper_library_dir/libvulkan-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext --entry-point-result=void | FileCheck %s
 
 // CHECK: [3.3,  3.3,  3.3,  3.3,  3.3,  3.3,  3.3,  3.3]

test/Conversion/LowerToLevelZero/linalg_addf.mlir

@@ -1,3 +1,6 @@
+// XFAIL: *
+// RUN:
+
 #map = affine_map<(d0, d1) -> (d0, d1)>
 module {
 func @addt(%arg0: tensor<2x5xf32>, %arg1: tensor<2x5xf32>) -> tensor<2x5xf32> {

test/Conversion/LowerToLevelZero/linalg_test.mlir

@@ -1,3 +1,6 @@
+// XFAIL: *
+// RUN:
+
 #map0 = affine_map<() -> ()>
 #map1 = affine_map<(d0) -> ()>
 #map2 = affine_map<(d0) -> (d0)>

test/lit.cfg.py

@@ -37,7 +37,7 @@
 # excludes: A list of directories to exclude from the testsuite. The 'Inputs'
 # subdirectories contain auxiliary inputs for various tests in their parent
 # directories.
-config.excludes = ['runlit.py', 'lit.cfg.py', 'CMakeLists.txt', 'addf.mlir', 'linalg_addf.mlir', 'linalg_test.mlir']
+config.excludes = ['runlit.py', 'lit.cfg.py', 'CMakeLists.txt']
 
 # test_source_root: The root path where tests are located.
 config.test_source_root = os.path.dirname(__file__)
@@ -56,4 +56,7 @@
     'dpcomp-opt',
 ]
 
+if os.environ.get('RUN_LIT_GPU_TESTS', None):
+    config.available_features.add('run-gpu-tests')
+
 llvm_config.add_tool_substitutions(tools, tool_dirs)