Win32 fixes?

.github/workflows/cmake-multi-platform.yml

@@ -56,16 +56,15 @@ jobs:
       run: |
         echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
 
-    - name: Install SPIRV-Headers
-      run: |
-        git clone https://github.com/KhronosGroup/SPIRV-Headers
-        mkdir SPIRV-Headers/build
-        cmake -B SPIRV-Headers/build -S SPIRV-Headers
-        mkdir SPIRV-Headers/install
-        cmake --install SPIRV-Headers/build --prefix SPIRV-Headers/install
+    #- name: Install SPIRV-Headers
+    #  run: |
+    #    git clone https://github.com/KhronosGroup/SPIRV-Headers
+    #    mkdir SPIRV-Headers/build
+    #    cmake -B SPIRV-Headers/build -S SPIRV-Headers
+    #    mkdir SPIRV-Headers/install
+    #    cmake --install SPIRV-Headers/build --prefix SPIRV-Headers/install
 
     - name: Install Clang & LLVM (setup-clang)
-      if: (!startsWith(matrix.os,'windows'))
       uses: egor-tensin/[email protected]
 
     #- name: Install LLVM (winlibs)
@@ -89,12 +88,6 @@ jobs:
       run: |
         echo "CMAKE_PLATFORM_SPECIFIC_ARGS=${{ env.CMAKE_PLATFORM_SPECIFIC_ARGS }} -DLLVM_DIR=/usr/lib/llvm-14/cmake" >> $GITHUB_ENV
 
-    - name: Install json-c (vcpkg)
-      if: startsWith(matrix.os,'windows')
-      run: |
-        vcpkg install json-c
-        echo "CMAKE_PLATFORM_SPECIFIC_ARGS=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" >> "$env:GITHUB_ENV"
-
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type

.gitignore

@@ -0,0 +1 @@
+build/

.gitmodules

@@ -1,3 +1,4 @@
-[submodule "murmur3"]
-	path = murmur3
-	url = https://github.com/PeterScott/murmur3
+[submodule "SPIRV-Headers"]
+	path = SPIRV-Headers
+	url = https://github.com/shady-gang/SPIRV-Headers.git
+	branch = main

CMakeLists.txt

@@ -1,53 +1,120 @@
 cmake_minimum_required(VERSION 3.13)
 project (shady C)
 
+include(ExternalProject)
+include(FetchContent)
+
+find_package(Git)
+
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
+option(SHADY_USE_FETCHCONTENT "Use FetchContent to grab json-c" ON)
+option(SHADY_WIN32_FIX_PARTIAL_LLVM_INSTALL "If you install LLVM on windows, it doesn't come with header files. This fixes it" ON)
 
 if (MSVC)
   add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
 endif()
 
-find_package(SPIRV-Headers REQUIRED)
+if (WIN32)
+  set(BUILD_SHARED_LIBS OFF)
+endif()
+
+add_subdirectory(SPIRV-Headers)
+
+if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24" AND ${SHADY_USE_FETCHCONTENT})
+    FetchContent_Declare(
+        json-c
+        GIT_REPOSITORY https://github.com/json-c/json-c
+        GIT_TAG master
+        OVERRIDE_FIND_PACKAGE
+    )
+
+    FetchContent_MakeAvailable(json-c)
+    add_library(json-c::json-c ALIAS json-c)
+    configure_file(${json-c_SOURCE_DIR}/json.h.cmakein ${json-c_BINARY_DIR}/json-c/json.h @ONLY)
+    target_include_directories(json-c PUBLIC $<BUILD_INTERFACE:${json-c_BINARY_DIR}>)
+else ()
+    message("CMake 3.24 or later is required to use FetchContent")
+endif ()
+
+find_package(LLVM QUIET)
+if (LLVM_FOUND)
+    message("LLVM ${LLVM_VERSION} found")
+endif()
+if(NOT ${LLVM_FOUND} AND WIN32 AND ${SHADY_WIN32_FIX_PARTIAL_LLVM_INSTALL})
+    find_program(clang_exe "clang.exe")
+    if(${clang_exe} STREQUAL "clang_exe-NOTFOUND")
+        message(STATUS "Win32: Installed LLVM not found")
+    else()
+        execute_process(COMMAND ${clang_exe} --version OUTPUT_VARIABLE clang_status)
+        string(REGEX MATCH "InstalledDir: (.*)[\r\n]" match ${clang_status})
+        file(TO_CMAKE_PATH "${CMAKE_MATCH_1}/../" LLVM_DIR)
+        cmake_path(ABSOLUTE_PATH LLVM_DIR NORMALIZE)
+        string(REGEX MATCH "clang version ([0-9]+).([0-9]+).([0-9]+)" match2 ${clang_status})
+        set(LLVM_VERSION_MAJOR ${CMAKE_MATCH_1})
+        set(LLVM_VERSION_MINOR ${CMAKE_MATCH_2})
+        set(LLVM_VERSION_PATCH ${CMAKE_MATCH_3})
+        set(LLVM_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}")
+        add_library(LLVM-C SHARED IMPORTED)
+        set_property(TARGET LLVM-C PROPERTY
+                     IMPORTED_LOCATION "${LLVM_DIR}bin/LLVM-C.dll")
+        set_property(TARGET LLVM-C PROPERTY
+                     IMPORTED_IMPLIB "${LLVM_DIR}lib/LLVM-C.lib")
+
+        execute_process(
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+            COMMAND ${GIT_EXECUTABLE} clone -n --depth 1 --filter=tree:0 https://github.com/llvm/llvm-project/ --branch "llvmorg-${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}"
+        )
+        execute_process(
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/llvm-project
+            COMMAND ${GIT_EXECUTABLE} sparse-checkout set --no-cone llvm/include/llvm-c
+        )
+        execute_process(
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/llvm-project
+            COMMAND ${GIT_EXECUTABLE} checkout
+        )
+        target_include_directories(LLVM-C INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/llvm-project/llvm/include)
+        target_compile_definitions(LLVM-C INTERFACE -DLLVM_VERSION_MAJOR=${LLVM_VERSION_MAJOR} -DLLVM_VERSION_MINOR=${LLVM_VERSION_MINOR} -DLLVM_VERSION_PATCH=${LLVM_VERSION_PATCH})
+        message(STATUS "Win32: Installed LLVM ${LLVM_VERSION} found at ${LLVM_DIR}")
+        set(LLVM_FOUND TRUE)
+    endif()
+endif()
+
+include(GNUInstallDirs)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 # required for MSVC
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS 1)
 
 cmake_policy(SET CMP0118 NEW)
 add_subdirectory(src)
+add_subdirectory(vcc)
+
+add_subdirectory(zhady)
 
 include(CTest)
 if (BUILD_TESTING)
   add_subdirectory(test)
 endif()
 
-set(BUILD_SAMPLES ON CACHE BOOL "Whether to build built-in demo applications")
-if (BUILD_SAMPLES)
-  add_subdirectory(samples)
-endif()
+add_subdirectory(samples)
 
 include(CMakePackageConfigHelpers)
 
-install(TARGETS api EXPORT shady_export_set)
-install(TARGETS shady EXPORT shady_export_set ARCHIVE DESTINATION ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
-
 if (TARGET vcc)
   add_subdirectory(vcc-std)
 endif ()
 
-if (TARGET runtime)
-  install(TARGETS runtime EXPORT shady_export_set ARCHIVE DESTINATION ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
-endif()
-
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/shady DESTINATION include)
 install(EXPORT shady_export_set DESTINATION share/cmake/shady/ NAMESPACE shady:: FILE shady-targets.cmake)
 
 configure_file(cmake/shady-config.cmake.in shady-config.cmake @ONLY)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shady-config.cmake" DESTINATION share/cmake/shady)
-#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shady-config.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/shady)

doc/code_style.md

@@ -0,0 +1,40 @@
+# Code style Guidelines
+
+This guide is for our own reference as much as anyone else.
+If you have a good reason for breaking any of those rules we're happy to consider your contributions without prejudice.
+
+ * 4 spaces indentation
+ * `Type* name`
+ * `snake_case` by default
+ * `UpperCamelCase` for types and typedefs
+ * Use only typedefs or append `_` to struct/union/enums names
+ * `LOUD_CASE` for public macros
+ * `{ spaces, surrounding, initializer, lists }`
+ * Unless you're literally contributing using a 80-column display (for which I'll ask visual proof), don't format your code as if you do.
+ * Include order: 
+   * If appropriate, (Private) `self.h` should always come first, with other local headers in the same group
+   * Then other `shady/` headers
+   * Then in-project utility headers
+   * Then external headers
+   * Finally, standard C library headers.
+   * Each category of includes spaced by an empty line
+
+## Symbol naming
+
+Due to C not having namespaces, we have to deal with this painfully automatable problem ourselves.
+
+ * Avoid exposing any symbols that don't need to be exposed (use `static` wherever you can)
+ * Prefixes:
+   * `shd_` in front of API functions (in the root `include` folder)
+     * `slim_`, `l2s_`, `spv_` and `vcc_` are used in various sub-projects
+   * `subsystem_` is acceptable for internal use
+   * `shd_subsystem_` is preferable where a clear delineation can be made
+   * `shd_new_thing` and `shd_destroy_thing` for constructors and destructors
+   * `static inline` functions in headers are not required to be prefixed
+   * Types & Typedefs may be prefixed with `Shd`
+     * Alternatively, subsystem-relevant ones can use another prefix, much like for functions
+* Do not expose global variables to external APIs at all (provide getter functions if necessary)
+
+## Cursing in comments
+
+Can be funny but keep it somewhat family friendly.

include/shady/analysis/literal.h

@@ -0,0 +1,20 @@
+#ifndef SHADY_ANALYSIS_LITERAL_H
+#define SHADY_ANALYSIS_LITERAL_H
+
+#include "shady/ir/grammar.h"
+
+const char* shd_get_string_literal(IrArena* arena, const Node* node);
+
+typedef struct {
+    bool enter_loads;
+    bool allow_incompatible_types;
+    bool assume_globals_immutability;
+} NodeResolveConfig;
+
+NodeResolveConfig shd_default_node_resolve_config(void);
+const Node* shd_chase_ptr_to_source(const Node* ptr, NodeResolveConfig config);
+const Node* shd_resolve_ptr_to_value(const Node* ptr, NodeResolveConfig config);
+
+const Node* shd_resolve_node_to_definition(const Node* node, NodeResolveConfig config);
+
+#endif

include/shady/be/c.h

@@ -0,0 +1,27 @@
+#ifndef SHD_BE_C_H
+#define SHD_BE_C_H
+
+#include "shady/ir/base.h"
+
+typedef enum {
+    CDialect_C11,
+    CDialect_GLSL,
+    CDialect_ISPC,
+    CDialect_CUDA,
+} CDialect;
+
+typedef struct {
+    CDialect dialect;
+    bool explicitly_sized_types;
+    bool allow_compound_literals;
+    bool decay_unsized_arrays;
+    int glsl_version;
+} CEmitterConfig;
+
+CEmitterConfig shd_default_c_emitter_config(void);
+
+typedef struct CompilerConfig_ CompilerConfig;
+void shd_emit_c(const CompilerConfig* compiler_config, CEmitterConfig config, Module* mod, size_t* output_size, char** output, Module** new_mod);
+
+#endif
+

include/shady/be/dump.h

@@ -0,0 +1,16 @@
+#ifndef SHD_BE_DUMP_H
+#define SHD_BE_DUMP_H
+
+#include "shady/ir/base.h"
+#include "shady/ir/module.h"
+
+#include <stdio.h>
+
+void shd_dump_module(Module* mod);
+void shd_dump_node(const Node* node);
+
+void shd_dump_cfgs(FILE* output, Module* mod);
+void shd_dump_loop_trees(FILE* output, Module* mod);
+
+#endif
+

include/shady/be/spirv.h

@@ -0,0 +1,10 @@
+#ifndef SHD_BE_SPIRV_H
+#define SHD_BE_SPIRV_H
+
+#include "shady/ir/base.h"
+
+typedef struct CompilerConfig_ CompilerConfig;
+void shd_emit_spirv(const CompilerConfig* config, Module* mod, size_t* output_size, char** output, Module** new_mod);
+
+#endif
+