Update for clang 19

fix-project · Jun 10, 2024 · df1a8bc · df1a8bc
1 parent 71181dd
commit df1a8bc
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 13 deletions.
diff --git a/Knitfile b/Knitfile
@@ -15,7 +15,7 @@ if cli.cmake_build_type then
   configure_flags = configure_flags .. "-DCMAKE_BUILD_TYPE=" .. cli.cmake_build_type
 end
 
-local llvm_include="build/llvm-project/llvm/lib/clang/18/include/"
+local llvm_include="build/llvm-project/llvm/lib/clang/19/include/"
 
 rules = b{}
 for _, step in pairs(fix_steps) do

diff --git a/build.sh b/build.sh
@@ -54,7 +54,7 @@ for task in ${Tasks}; do
   do
     if test -f "${OUTPUT}"/"${task}"/function"${i}".c; then
 
-      "${SRC}"/build/src/sys-driver/c-to-elf-sys "${OUTPUT}"/"${task}"/function"${i}".c "${OUTPUT}"/"${task}"/function-impl.h "${OUTPUT}"/"${task}"/function.h "${SRC}"/build/llvm-project/llvm/lib/clang/18/include/ "${OUTPUT}"/"${task}"/function"${i}".o &
+      "${SRC}"/build/src/sys-driver/c-to-elf-sys "${OUTPUT}"/"${task}"/function"${i}".c "${OUTPUT}"/"${task}"/function-impl.h "${OUTPUT}"/"${task}"/function.h "${SRC}"/build/llvm-project/llvm/lib/clang/19/include/ "${OUTPUT}"/"${task}"/function"${i}".o &
       running=$(jobs -r | wc -l)
       if [ "$running" -ge $(("$PARALLEL"-1)) ]
       then

diff --git a/fix b/fix
diff --git a/serialize.sh b/serialize.sh
@@ -9,4 +9,4 @@ mkdir -p ${FIX}/relations
 mkdir -p ${FIX}/labels
 mkdir -p ${FIX}/pins
 
-${SRC}/build/src/serialize/serialize ${SRC}/ ${SRC}/build/llvm-project/llvm/lib/clang/18/include/
+${SRC}/build/src/serialize/serialize ${SRC}/ ${SRC}/build/llvm-project/llvm/lib/clang/19/include/
diff --git a/src/clang/cc1args.h b/src/clang/cc1args.h
@@ -14,8 +14,6 @@ const char* cc1args[] = { "-ferror-limit",
                           "-tune-cpu",
                           "znver2",
                           "-target-feature",
-                          "-avx512pf",
-                          "-target-feature",
                           "-tsxldtrk",
                           "-target-feature",
                           "+cx16",
@@ -62,8 +60,6 @@ const char* cc1args[] = { "-ferror-limit",
                           "-target-feature",
                           "+xsaves",
                           "-target-feature",
-                          "-avx512er",
-                          "-target-feature",
                           "-avxvnni",
                           "-target-feature",
                           "-avx512fp16",
@@ -160,8 +156,6 @@ const char* cc1args[] = { "-ferror-limit",
                           "-target-feature",
                           "+pclmul",
                           "-target-feature",
-                          "-prefetchwt1",
-                          "-target-feature",
                           "+f16c",
                           "-target-feature",
                           "+ssse3",

diff --git a/src/clang/depfile.hh b/src/clang/depfile.hh
@@ -68,6 +68,7 @@ static const std::vector<const char*> system_deps
 
 static const std::vector<const char*> clang_deps
   = { "/usr/lib/llvm-16/lib/clang/16.0.0/include/immintrin.h",
+      "/usr/lib/llvm-16/lib/clang/16.0.0/include/adcintrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/x86gprintrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/usermsrintrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/hresetintrin.h",
@@ -84,6 +85,7 @@ static const std::vector<const char*> clang_deps
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/__stdarg_va_copy.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/__stdarg_va_list.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/__stdarg___gnuc_va_list.h",
+      "/usr/lib/llvm-16/lib/clang/16.0.0/include/__stdarg_header_macro.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/stddef.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/__stddef_max_align_t.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/__stddef_ptrdiff_t.h",
@@ -96,6 +98,7 @@ static const std::vector<const char*> clang_deps
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/__stddef_max_align_t.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/__stddef_offsetof.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/__stddef_wint_t.h",
+      "/usr/lib/llvm-16/lib/clang/16.0.0/include/__stddef_header_macro.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/emmintrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/pmmintrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/tmmintrin.h",
@@ -128,15 +131,13 @@ static const std::vector<const char*> clang_deps
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vlbwintrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vlcdintrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vldqintrin.h",
-      "/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512erintrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512ifmaintrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512ifmavlintrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/avxifmaintrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vbmiintrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vbmivlintrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vbmi2intrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vlvbmi2intrin.h",
-      "/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512pfintrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512fp16intrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vlfp16intrin.h",
       "/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512bf16intrin.h",

diff --git a/src/fix-driver/CMakeLists.txt b/src/fix-driver/CMakeLists.txt
@@ -2,7 +2,7 @@ add_link_options(-nostdlib -Wl,--no-entry -Wl,--allow-undefined)
 set(LIBS $ENV{HOME}/wasm-toolchain/sysroot/lib/wasm32-wasi/libc++.a
          $ENV{HOME}/wasm-toolchain/sysroot/lib/wasm32-wasi/libc++abi.a
          $ENV{HOME}/wasm-toolchain/sysroot/lib/wasm32-wasi/libc.a
-         $ENV{HOME}/wasm-toolchain/sysroot/lib/clang/18/lib/wasi/libclang_rt.builtins-wasm32.a)
+         $ENV{HOME}/wasm-toolchain/sysroot/lib/clang/19/lib/wasi/libclang_rt.builtins-wasm32.a)
 
 add_library(stub-obj OBJECT "stubs.c")
+1 −1		.github/workflows/compile.yml
+1 −1		.gitignore
+10 −65		applications/count-words/count_words.c
+11 −145		applications/count-words/merge_counts.c
+3 −2		applications/flatware/CMakeLists.txt
+444 −40		applications/flatware/c-flatware.c
+1 −0		applications/flatware/examples/CMakeLists.txt
+29 −0		applications/flatware/examples/python/CMakeLists.txt
+1 −0		applications/flatware/flatware-decs.h
+14 −0		applications/flatware/generate.py
+2 −2		applications/map/add_2.cc
+28 −8		applications/mapreduce/mapreduce.cc
+3 −4		applications/util/CMakeLists.txt
+1 −1		applications/util/cmake_helper_functions.cmake
+1 −1		docs/bootstrap.md
+51 −0		docs/flatware.md
+6 −1		etc/tests.cmake
+11 −11		src/handle/handle_post.hh
+4 −1		src/handle/operators.hh
+7 −1		src/runtime/dependency_graph.hh
+21 −21		src/runtime/executor.cc
+2 −3		src/runtime/fixpointapi.cc
+45 −21		src/runtime/message.cc
+9 −2		src/runtime/message.hh
+315 −111		src/runtime/network.cc
+23 −5		src/runtime/network.hh
+484 −230		src/runtime/pass.cc
+45 −20		src/runtime/pass.hh
+52 −53		src/runtime/relater.cc
+16 −10		src/runtime/relater.hh
+0 −5		src/runtime/runner.hh
+12 −8		src/runtime/runtimes.cc
+7 −3		src/runtime/runtimes.hh
+36 −62		src/runtime/scheduler.cc
+1 −6		src/runtime/scheduler.hh
+7 −21		src/storage/handle_util.hh
+10 −38		src/storage/interface.hh
+15 −9		src/storage/repository.cc
+0 −10		src/storage/runtimestorage.cc
+0 −5		src/storage/runtimestorage.hh
+6 −0		src/tester/CMakeLists.txt
+122 −49		src/tester/fix.cc
+53 −0		src/tester/fixpoint-client-compile.cc
+65 −0		src/tester/fixpoint-client-wikipedia.cc
+39 −1		src/tester/fixpoint-server.cc
+0 −37		src/tester/tester-utils.cc
+41 −0		src/tester/tester-utils.hh
+6 −0		src/tests/CMakeLists.txt
+21 −19		src/tests/test-countwords.cc
+2 −1		src/tests/test-mapreduce.cc
+59 −0		src/tests/test-python-flatware.cc
+100 −0		src/tests/test-relater.cc
+255 −12		src/tests/test-scheduler.cc
+4 −2		src/tests/test.hh
+1 −0		wikipedia/.gitignore
+12 −0		wikipedia/load.sh
+18 −0		wikipedia/mktemplate.sh
+51 −0		wikipedia/scatter.sh