Upgrade to LLVM 14.0.6

Author: jranieri-grammatech

.gitlab-ci.yml

@@ -36,7 +36,7 @@ check-format:
 build-linux:
   stage: build
   needs: [check-format]
-  image: $DOCKER_REGISTRY/rewriting/mc-asm/llvm:13-RTTI
+  image: $DOCKER_REGISTRY/rewriting/mc-asm/llvm:14
   artifacts:
     name: "$CI_COMMIT_REF_NAME-$CI_JOB_NAME"
     paths:
@@ -53,7 +53,7 @@ build-linux:
 
 build-windows:
   stage: build
-  tags: [rewriting-windows]
+  tags: [mcasm-windows]
   artifacts:
     paths:
       - mcasm*.whl

CMakeLists.txt

@@ -21,7 +21,7 @@ endif()
 # Now we can find pybind11
 find_package(pybind11 CONFIG REQUIRED)
 
-find_package(LLVM 13 CONFIG REQUIRED)
+find_package(LLVM 14 CONFIG REQUIRED)
 list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
 
 include(AddLLVM)

Dockerfile.llvm

@@ -19,17 +19,22 @@ RUN cd cmake-3.18.4 && \
     cd .. && \
     rm -rf cmake-3.18.4
 
-RUN wget https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/llvm-13.0.0.src.tar.xz && \
-    tar -xf llvm-13.0.0.src.tar.xz && \
-    rm llvm-13.0.0.src.tar.xz
+RUN wget https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-14.0.6.src.tar.xz && \
+    tar -xf llvm-14.0.6.src.tar.xz && \
+    rm llvm-14.0.6.src.tar.xz
 
 RUN mkdir llvm-build && \
     cd llvm-build && \
-    cmake -G Ninja ../llvm-13.0.0.src -DLLVM_ENABLE_RTTI=ON -DLLVM_ENABLE_ZLIB=OFF -DLLVM_ENABLE_TERMINFO=OFF -DLLVM_ENABLE_LIBXML2=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLLVM_PARALLEL_LINK_JOBS=1 -DLLVM_USE_LINKER=gold && \
+    cmake -G Ninja ../llvm-14.0.6.src \
+        -DLLVM_ENABLE_RTTI=ON \
+        -DLLVM_ENABLE_ZLIB=OFF \
+        -DLLVM_ENABLE_TERMINFO=OFF \
+        -DLLVM_ENABLE_LIBXML2=OFF \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DLLVM_PARALLEL_LINK_JOBS=1 \
+        -DLLVM_INCLUDE_BENCHMARKS=OFF \
+        -DLLVM_LINK_LLVM_DYLIB=ON && \
     ninja-build && \
     ninja-build install && \
     cd .. && \
-    rm -rf llvm-build llvm-13.0.0.src
-
-# The later CI steps will need conan to be installed
-RUN pip install conan
+    rm -rf llvm-build llvm-14.0.6.src

README.md

@@ -27,5 +27,5 @@ MCASM repository.
   - AArch64MCExpr.h (from `llvm/lib/Target/AArch64/MCTargetDesc/`)
   - MipsMCExpr.h (from `llvm/lib/Target/Mips/MCTargetDesc/`)
 * Project Name: LLVM
-* Project Version: 13.0
+* Project Version: 14.0.6
 * License: Apache License v2.0 with LLVM Exceptions

src/bind.cpp

@@ -14,11 +14,11 @@
 #include <llvm/MC/MCSectionMachO.h>
 #include <llvm/MC/MCStreamer.h>
 #include <llvm/MC/MCSubtargetInfo.h>
+#include <llvm/MC/TargetRegistry.h>
 #include <llvm/Support/Host.h>
 #include <llvm/Support/JSON.h>
 #include <llvm/Support/MemoryBuffer.h>
 #include <llvm/Support/SourceMgr.h>
-#include <llvm/Support/TargetRegistry.h>
 #include <llvm/Support/TargetSelect.h>
 #include <memory>
 
@@ -222,7 +222,7 @@ void init_sections(std::shared_ptr<ParserState> State, bool NoExecStack) {
   py_dispatch(
       __func__,
       [](std::shared_ptr<ParserState> State, bool NoExecStack) {
-        State->Str->MCStreamer::InitSections(NoExecStack);
+        State->Str->MCStreamer::initSections(NoExecStack, *State->STI);
       },
       State, NoExecStack);
 }
@@ -782,7 +782,7 @@ void emit_nops(std::shared_ptr<ParserState> State, int64_t NumBytes,
       [](std::shared_ptr<ParserState> State, int64_t NumBytes,
          int64_t ControlledNopLength, std::shared_ptr<mc::SourceLocation> Loc) {
         State->Str->MCStreamer::emitNops(NumBytes, ControlledNopLength,
-                                         unwrap(Loc));
+                                         unwrap(Loc), *State->STI);
       },
       State, NumBytes, ControlledNopLength, Loc);
 }
@@ -806,8 +806,8 @@ void emit_code_alignment(std::shared_ptr<ParserState> State,
       __func__,
       [](std::shared_ptr<ParserState> State, unsigned ByteAlignment,
          unsigned MaxBytesToEmit) {
-        State->Str->MCStreamer::emitCodeAlignment(ByteAlignment,
-                                                  MaxBytesToEmit);
+        State->Str->MCStreamer::emitCodeAlignment(
+            ByteAlignment, State->STI.get(), MaxBytesToEmit);
       },
       State, ByteAlignment, MaxBytesToEmit);
 }
@@ -1764,7 +1764,7 @@ class StreamerAdaptor : public FriendlyStreamer {
     dispatch(&PyStreamer::change_section, wrap(Section), wrap(SubSection));
   }
 
-  void InitSections(bool NoExecStack) override {
+  void initSections(bool NoExecStack, const MCSubtargetInfo& STI) override {
     dispatch(&PyStreamer::init_sections, NoExecStack);
   }
 
@@ -1999,8 +1999,8 @@ class StreamerAdaptor : public FriendlyStreamer {
              wrap(Loc));
   }
 
-  void emitNops(int64_t NumBytes, int64_t ControlledNopLength,
-                SMLoc Loc) override {
+  void emitNops(int64_t NumBytes, int64_t ControlledNopLength, SMLoc Loc,
+                const MCSubtargetInfo& STI) override {
     dispatch(&PyStreamer::emit_nops, NumBytes, ControlledNopLength, wrap(Loc));
   }
 
@@ -2011,7 +2011,7 @@ class StreamerAdaptor : public FriendlyStreamer {
              ValueSize, MaxBytesToEmit);
   }
 
-  void emitCodeAlignment(unsigned ByteAlignment,
+  void emitCodeAlignment(unsigned ByteAlignment, const MCSubtargetInfo* STI,
                          unsigned MaxBytesToEmit = 0) override {
     dispatch(&PyStreamer::emit_code_alignment, ByteAlignment, MaxBytesToEmit);
   }

src/mc.cpp

@@ -72,9 +72,9 @@ std::shared_ptr<Diagnostic> mc::wrap(std::shared_ptr<ParserState> State,
   return std::make_shared<Diagnostic>(State, Diag);
 }
 
-std::shared_ptr<Instruction> mc::wrap(std::shared_ptr<ParserState> State,
-                                      const llvm::MCInst& Inst) {
-  return std::make_shared<Instruction>(State, Inst);
+std::shared_ptr<mc::Instruction> mc::wrap(std::shared_ptr<ParserState> State,
+                                          const llvm::MCInst& Inst) {
+  return std::make_shared<mc::Instruction>(State, Inst);
 }
 
 std::shared_ptr<InstructionDesc> mc::wrap(std::shared_ptr<ParserState> State,

src/state.h

@@ -17,9 +17,9 @@
 #include <llvm/MC/MCSectionMachO.h>
 #include <llvm/MC/MCStreamer.h>
 #include <llvm/MC/MCSubtargetInfo.h>
+#include <llvm/MC/TargetRegistry.h>
 #include <llvm/Support/MemoryBuffer.h>
 #include <llvm/Support/SourceMgr.h>
-#include <llvm/Support/TargetRegistry.h>
 #include <llvm/Support/TargetSelect.h>
 #include <memory>