Make playground a separate CMake project (#4)

Author: wildarch

.github/workflows/ci.yml

@@ -19,22 +19,18 @@ jobs:
           source /root/emsdk/emsdk_env.sh
           npm --workspace=codemirror-lang-graphalg install
           npm --workspace=codemirror-lang-graphalg run prepare
-      - name: Build compiler (native)
+      - name: Build compiler
         shell: bash
         run: |
           ./compiler/configure.sh
           cmake --build ./compiler/build
           cmake --build ./compiler/build --target check
-      - name: Build compiler (wasm)
-        shell: bash
-        run: |
-          source /root/emsdk/emsdk_env.sh
-          ./compiler/configure-wasm.sh
-          cmake --build ./compiler/build-wasm
       - name: Build playground
         shell: bash
         run: |
           source /root/emsdk/emsdk_env.sh
+          playground/cpp/configure-wasm.sh
+          cmake --build playground/cpp/build-wasm --target graphalg-playground
           npm --workspace=playground install
           npm --workspace=playground run prepare
       - name: Build website

.github/workflows/pages.yml

@@ -40,16 +40,12 @@ jobs:
           source /root/emsdk/emsdk_env.sh
           npm --workspace=codemirror-lang-graphalg install
           npm --workspace=codemirror-lang-graphalg run prepare
-      - name: Build compiler (wasm)
-        shell: bash
-        run: |
-          source /root/emsdk/emsdk_env.sh
-          ./compiler/configure-wasm.sh
-          cmake --build ./compiler/build-wasm
       - name: Build playground
         shell: bash
         run: |
           source /root/emsdk/emsdk_env.sh
+          playground/cpp/configure-wasm.sh
+          cmake --build playground/cpp/build-wasm --target graphalg-playground
           npm --workspace=playground install
           npm --workspace=playground run prepare
 

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "mlir.tablegen_compilation_databases": [
-        "compiler/build/tablegen_compile_commands.yml"
+        "compiler/build/tablegen_compile_commands.yml",
     ],
-    "mlir.server_path": "/workspaces/graphalg/compiler/build/graphalg-lsp-server",
+    "mlir.server_path": "/workspaces/graphalg/compiler/build/tools/graphalg-lsp-server",
 }

README.md

@@ -16,10 +16,9 @@ npm --workspace=codemirror-lang-graphalg run prepare
 cmake --build ./compiler/build
 cmake --build ./compiler/build --target check
 
-./compiler/configure-wasm.sh
-cmake --build ./compiler/build-wasm
-
 npm --workspace=playground install
+playground/cpp/configure-wasm.sh
+cmake --build playground/cpp/build-wasm --target graphalg-playground
 # Or npm --workspace=playground run watch to rebuild automatically upon edit.
 npm --workspace=playground run prepare
 

compiler/CMakeLists.txt

@@ -18,8 +18,6 @@ option(ENABLE_WASM "Enable wasm-only targets" OFF)
 # ================================= BEGIN LLVM =================================
 
 find_package(LLVM REQUIRED CONFIG)
-message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
-message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 include_directories(${LLVM_INCLUDE_DIRS})
 separate_arguments(LLVM_DEFINITIONS_LIST NATIVE_COMMAND ${LLVM_DEFINITIONS})
 add_definitions(${LLVM_DEFINITIONS_LIST})
@@ -41,8 +39,8 @@ list(APPEND CMAKE_MODULE_PATH "${MLIR_CMAKE_DIR}")
 
 # Using a placeholder to set MLIR_TABLEGEN_EXE because find_package(MLIR)
 # overwrites the MLIR_TABLEGEN_EXE flag
-if(DEFINED SET_MLIR_TABLEGEN_PATH)
-    set(MLIR_TABLEGEN_EXE "${SET_MLIR_TABLEGEN_PATH}")
+if(DEFINED GRAPHALG_OVERRIDE_MLIR_TABLEGEN_PATH)
+    set(MLIR_TABLEGEN_EXE "${GRAPHALG_OVERRIDE_MLIR_TABLEGEN_PATH}")
 endif()
 
 include(AddMLIR)
@@ -51,132 +49,6 @@ include(AddMLIR)
 # Directories with MLIR dialects
 add_subdirectory(include/graphalg)
 
+add_subdirectory(src)
 add_subdirectory(test)
-
-# graphalg_lib
-add_library(graphalg_lib STATIC
-    src/graphalg/analysis/DenseAnalysis.cpp
-    src/graphalg/GraphAlgAttr.cpp
-    src/graphalg/GraphAlgAttr.cpp
-    src/graphalg/GraphAlgCanonicalize.cpp
-    src/graphalg/GraphAlgCast.cpp
-    src/graphalg/GraphAlgDialect.cpp
-    src/graphalg/GraphAlgExplicateSparsity.cpp
-    src/graphalg/GraphAlgInterfaces.cpp
-    src/graphalg/GraphAlgLoopAggregate.cpp
-    src/graphalg/GraphAlgOps.cpp
-    src/graphalg/GraphAlgPrepareInlinePass.cpp
-    src/graphalg/GraphAlgScalarizeApply.cpp
-    src/graphalg/GraphAlgSetDimensions.cpp
-    src/graphalg/GraphAlgSplitAggregate.cpp
-    src/graphalg/GraphAlgToCore.cpp
-    src/graphalg/GraphAlgToCorePipeline.cpp
-    src/graphalg/GraphAlgTypes.cpp
-    src/graphalg/GraphAlgVerifyDimensions.cpp
-    src/graphalg/SemiringTypes.cpp
-    src/graphalg/evaluate/Evaluator.cpp
-)
-target_include_directories(graphalg_lib PUBLIC include)
-target_include_directories(graphalg_lib SYSTEM PUBLIC ${PROJECT_BINARY_DIR}/include)
-add_dependencies(graphalg_lib
-    MLIRGraphAlgOpsIncGen
-    MLIRGraphAlgPassesIncGen
-    MLIRGraphAlgInterfacesIncGen
-)
-target_link_libraries(
-    graphalg_lib
-    PRIVATE
-    MLIRAnalysis
-    MLIRFuncDialect
-    MLIRFuncInlinerExtension
-    MLIRInferTypeOpInterface
-    MLIRIR
-    MLIRPass
-    MLIRPass
-    MLIRSupport
-    MLIRTransforms
-)
-# Suppress -Wdangling-assignment-gsl for generated code from MLIR tablegen
-# The warning is triggered by template instantiations in GraphAlgOps.cpp.inc
-target_compile_options(graphalg_lib PRIVATE -Wno-dangling-assignment-gsl)
-if(NOT GRAPHALG_ENABLE_RTTI)
-  target_compile_options(graphalg_lib PUBLIC -fno-rtti)
-endif()
-
-add_library(graphalg_parse STATIC
-    src/graphalg/parse/Lexer.cpp
-    src/graphalg/parse/Parser.cpp
-)
-target_link_libraries(graphalg_parse PRIVATE graphalg_lib)
-
-add_executable(graphalg-translate src/graphalg-translate.cpp)
-target_link_libraries(graphalg-translate PRIVATE
-    ${llvm_libs}
-    graphalg_lib
-    graphalg_parse
-    MLIRTranslateLib
-)
-
-add_executable(graphalg-opt src/graphalg-opt.cpp)
-target_link_libraries(graphalg-opt PRIVATE
-    ${llvm_libs}
-    graphalg_lib
-    MLIROptLib
-)
-
-add_executable(graphalg-lsp-server src/graphalg-lsp-server.cpp)
-target_link_libraries(graphalg-lsp-server PRIVATE
-    ${llvm_libs}
-    graphalg_lib
-    MLIRLspServerLib
-)
-
-add_executable(graphalg-exec src/graphalg-exec.cpp)
-target_link_libraries(graphalg-exec PRIVATE
-    ${llvm_libs}
-    graphalg_lib
-    MLIRParser
-)
-
-add_executable(graphalg-playground src/graphalg-playground.cpp)
-target_link_libraries(graphalg-playground PRIVATE
-    ${llvm_libs}
-    graphalg_lib
-    graphalg_parse
-)
-
-if(ENABLE_WASM)
-    set(PLAYGROUND_EXPORTED_FUNCTIONS
-        _ga_new
-        _ga_free
-        _ga_parse
-        _ga_diag_count
-        _ga_diag_line_start
-        _ga_diag_line_end
-        _ga_diag_col_start
-        _ga_diag_col_end
-        _ga_diag_msg
-        _ga_desugar
-        _ga_add_arg
-        _ga_set_dims
-        _ga_set_arg_bool
-        _ga_set_arg_int
-        _ga_set_arg_real
-        _ga_evaluate
-        _ga_get_res_ring
-        _ga_get_res_rows
-        _ga_get_res_cols
-        _ga_get_res_bool
-        _ga_get_res_int
-        _ga_get_res_real
-        _ga_get_res_inf
-    )
-    string (REPLACE ";" "," PLAYGROUND_EXPORTED_FUNCTIONS_STR "${PLAYGROUND_EXPORTED_FUNCTIONS}")
-
-
-    target_link_options(graphalg-playground PRIVATE
-        -sEXPORTED_FUNCTIONS=${PLAYGROUND_EXPORTED_FUNCTIONS_STR}
-        -sEXPORTED_RUNTIME_METHODS=cwrap,UTF8ToString
-        -sMODULARIZE
-        -sEXPORT_ES6)
-endif()
+add_subdirectory(tools)

compiler/configure.sh

@@ -8,5 +8,5 @@ cmake -S $WORKSPACE_ROOT -B $BUILD_DIR -G Ninja \
     -DCMAKE_CXX_COMPILER=clang++-20  \
     -DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
     -DCMAKE_LINKER_TYPE=MOLD \
+    -DGRAPHALG_OVERRIDE_LLVM_TOOLS_BINARY_DIR="/usr/lib/llvm-20/bin" \
     -DLLVM_ROOT="/opt/llvm-debug" \
-    -DSET_LLVM_TOOLS_BINARY_DIR="/usr/lib/llvm-20/bin"

compiler/src/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(graphalg)

compiler/src/graphalg/CMakeLists.txt

@@ -0,0 +1,57 @@
+add_library(GraphAlgIR
+    GraphAlgAttr.cpp
+    GraphAlgCanonicalize.cpp
+    GraphAlgCast.cpp
+    GraphAlgDialect.cpp
+    GraphAlgInterfaces.cpp
+    GraphAlgOps.cpp
+    GraphAlgInferDensity.cpp
+    GraphAlgTypes.cpp
+    SemiringTypes.cpp
+)
+target_include_directories(GraphAlgIR PUBLIC ../../include)
+target_include_directories(GraphAlgIR SYSTEM PUBLIC ${PROJECT_BINARY_DIR}/include)
+add_dependencies(GraphAlgIR
+    MLIRGraphAlgOpsIncGen
+    MLIRGraphAlgPassesIncGen
+    MLIRGraphAlgInterfacesIncGen
+)
+target_link_libraries(
+    GraphAlgIR
+    PRIVATE
+    MLIRFuncDialect
+    MLIRFuncInlinerExtension
+    MLIRInferTypeOpInterface
+    MLIRIR
+    MLIRSupport
+)
+# Suppress -Wdangling-assignment-gsl for generated code from MLIR tablegen
+# The warning is triggered by template instantiations in GraphAlgOps.cpp.inc
+target_compile_options(GraphAlgIR PRIVATE -Wno-dangling-assignment-gsl)
+if(NOT GRAPHALG_ENABLE_RTTI)
+  target_compile_options(GraphAlgIR PUBLIC -fno-rtti)
+endif()
+
+add_library(GraphAlgPasses
+    GraphAlgExplicateSparsity.cpp
+    GraphAlgLoopAggregate.cpp
+    GraphAlgPrepareInlinePass.cpp
+    GraphAlgScalarizeApply.cpp
+    GraphAlgSetDimensions.cpp
+    GraphAlgSplitAggregate.cpp
+    GraphAlgToCore.cpp
+    GraphAlgToCorePipeline.cpp
+    GraphAlgVerifyDimensions.cpp
+)
+add_dependencies(GraphAlgPasses MLIRGraphAlgPassesIncGen)
+target_link_libraries(
+    GraphAlgPasses
+    PRIVATE
+    GraphAlgAnalysis
+    GraphAlgIR
+    MLIRTransforms
+)
+
+add_subdirectory(analysis)
+add_subdirectory(evaluate)
+add_subdirectory(parse)

compiler/src/graphalg/GraphAlgInferDensity.cpp

@@ -0,0 +1,35 @@
+#include "graphalg/GraphAlgOps.h"
+#include "graphalg/analysis/DenseAnalysis.h"
+
+namespace graphalg {
+
+// Used in DenseResult trait
+void markAllDense(llvm::ArrayRef<DensityLattice *> results,
+                  llvm::MutableArrayRef<mlir::ChangeResult> changedResults) {
+  for (auto [i, r] : llvm::enumerate(results)) {
+    changedResults[i] |= r->setDense(true);
+  }
+}
+
+static bool isDense(const DensityLattice *l) { return l->isDense(); }
+
+// Used in PropagatesDense trait
+void markDenseIfAllInputsDense(
+    llvm::ArrayRef<const DensityLattice *> operands,
+    llvm::ArrayRef<DensityLattice *> results,
+    llvm::MutableArrayRef<mlir::ChangeResult> changedResults) {
+  auto allDense = llvm::all_of(operands, isDense);
+  for (auto [i, r] : llvm::enumerate(results)) {
+    changedResults[i] |= r->setDense(allDense);
+  }
+}
+
+void ElementWiseAddOp::inferDensity(
+    llvm::ArrayRef<const DensityLattice *> operands,
+    llvm::ArrayRef<DensityLattice *> results,
+    llvm::MutableArrayRef<mlir::ChangeResult> changedResults) {
+  auto anyDense = llvm::any_of(operands, isDense);
+  changedResults[0] |= results[0]->setDense(anyDense);
+}
+
+} // namespace graphalg

compiler/src/graphalg/analysis/CMakeLists.txt

@@ -0,0 +1,9 @@
+add_library(GraphAlgAnalysis
+    DenseAnalysis.cpp
+)
+target_link_libraries(
+    GraphAlgAnalysis
+    PRIVATE
+    GraphAlgIR
+    MLIRAnalysis
+)