Compiler client and server

.gdbinit

@@ -179,6 +179,25 @@ define ds
   dumpsxp $arg0 1
 end
 
+define refetch
+    shell /usr/bin/git fetch mine && /usr/bin/git reset --hard mine/$(/usr/bin/git rev-parse --abbrev-ref HEAD) && /usr/bin/ninja
+    python gdb.execute("file " + gdb.current_progspace().filename)
+    directory
+    run
+end
+
+define rerun
+    python gdb.execute("file " + gdb.current_progspace().filename)
+    directory
+    run
+end
+
+define ninja
+    shell ninja
+    python gdb.execute("file " + gdb.current_progspace().filename)
+    directory
+end
+
 # source .pirpp.py
 
 

.gitignore

@@ -36,4 +36,7 @@ benchmarks/
 *.DS_Store
 external/*
 !external/custom-r
-.history
+!external/xxHash
+.history
+.cache
+compile_commands.json

.gitlab-ci.yml

@@ -189,7 +189,7 @@ tests_fullverify:
     - make -j6
     - bin/tests
 
-# Test particular features, like deoptimization and serialization
+# Test particular features, like deoptimization
 test_features_1:
   image: registry.gitlab.com/rirvm/rir_mirror:$CI_COMMIT_SHA
   variables:
@@ -265,6 +265,73 @@ test_features_3:
     when: on_failure
     expire_in: 1 week
 
+# Test serialization (no LLVM bitcode)
+test_serialize_chaos:
+  image: registry.gitlab.com/rirvm/rir_mirror:$CI_COMMIT_SHA
+  variables:
+    GIT_STRATEGY: none
+    PIR_LLVM_OPT_LEVEL: 0
+  stage: Run tests
+  needs:
+    - rir_container
+  except:
+    - schedules
+  script:
+    - /opt/rir/container/install-test-deps.sh
+    - cd /opt/rir/build/release
+    - RIR_SERIALIZE_CHAOS=5 FAST_TESTS=1 bin/tests
+    - PIR_WARMUP=2 RIR_SERIALIZE_CHAOS=50 bin/gnur-make-tests check || $SAVE_LOGS
+    - ../../tools/check-gnur-make-tests-error
+    - RIR_SERIALIZE_CHAOS=10 bin/tests
+  artifacts:
+    paths:
+      - logs
+    when: on_failure
+    expire_in: 1 week
+
+# Test LLVM bitcode serialization
+test_serialize_llvm:
+  image: registry.gitlab.com/rirvm/rir_mirror:$CI_COMMIT_SHA
+  variables:
+    GIT_STRATEGY: none
+    PIR_LLVM_OPT_LEVEL: 0
+  stage: Run tests
+  needs:
+    - rir_container
+  except:
+    - schedules
+  script:
+    - /opt/rir/container/install-test-deps.sh
+    - cd /opt/rir/build/release
+    - PIR_DEBUG_SERIALIZE_LLVM=1 bin/gnur-make-tests check || $SAVE_LOGS
+    - ../../tools/check-gnur-make-tests-error
+  artifacts:
+    paths:
+      - logs
+    when: on_failure
+    expire_in: 1 week
+
+# Test regular and LLVM bitcode serialization
+test_serialize_both:
+  image: registry.gitlab.com/rirvm/rir_mirror:$CI_COMMIT_SHA
+  variables:
+    GIT_STRATEGY: none
+    PIR_LLVM_OPT_LEVEL: 0
+  stage: Run tests
+  needs:
+    - rir_container
+  except:
+    - schedules
+  script:
+    - /opt/rir/container/install-test-deps.sh
+    - cd /opt/rir/build/release
+    - PIR_DEBUG_SERIALIZE_LLVM=1 FAST_TESTS=1 RIR_SERIALIZE_CHAOS=5 bin/tests
+    - PIR_DEBUG_SERIALIZE_LLVM=1 RIR_SERIALIZE_CHAOS=10 bin/tests
+  artifacts:
+    paths:
+      - logs
+    when: on_failure
+    expire_in: 1 week
 
 # Run ubsan and gc torture
 test_gctorture_1:
@@ -334,25 +401,73 @@ test_big_inline:
 test_sanitize:
   image: registry.gitlab.com/rirvm/rir_mirror:$CI_COMMIT_SHA
   variables:
+    CLANG_DIR: /opt/clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04
     GIT_STRATEGY: none
   stage: Run tests
   needs:
     - rir_container
   except:
     - schedules
   script:
+    # TODO: Store clang-16 and zlib on prl
+    # Install clang-16
+    - apt install libtinfo5
+    - wget https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz -O $CLANG_DIR.tar.xz
+    - tar -xf $CLANG_DIR.tar.xz -C /opt
+    # Manually add zlib (required when building on clang-16)
+    - wget https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.tar.xz -O /opt/rir/external/zlib-1.3.tar.xz
+    - tar -xf /opt/rir/external/zlib-1.3.tar.xz -C /opt/rir/external
+    - cd /opt/rir/external/zlib-1.3
+    - ./configure --prefix=/opt/rir/external/zlib
+    - make -j6
+    - make install
+    # Rest
     - curl 10.200.14.25:8080/clang+llvm-12.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz > /opt/rir/external/clang+llvm-12.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz
     - mkdir /opt/rir/build/sanitize
     - cd /opt/rir/build/sanitize
     - /opt/rir/tools/fetch-llvm.sh
-    - CC=$(ls ../../external/clang*/bin/clang) CXX=$(ls ../../external/clang*/bin/clang) cmake -DCMAKE_BUILD_TYPE=sanitize ../..
+    - cmake -DCMAKE_BUILD_TYPE=sanitize
+            -DCMAKE_C_COMPILER=$CLANG_DIR/bin/clang
+            -DCMAKE_CXX_COMPILER=$CLANG_DIR/bin/clang++
+            -DZLIB_LIBRARY=/opt/rir/external/zlib/lib/libz.so
+            -DZLIB_INCLUDE_DIR=/opt/rir/external/zlib/include
+            ../..
     - make -j6
     # R_LD_PRELOAD is a feature of the test-runner. To repro this without the testrunner use LD_PRELOAD instead.
     # intercept_tls_get_addr=0 helps with leak sanitizer crashes
-    - ASAN_OPTIONS="intercept_tls_get_addr=0" LSAN_OPTIONS="symbolize=1" ASAN_SYMBOLIZER_PATH=$(ls /opt/rir/external/clang*/bin/llvm-symbolizer) R_LD_PRELOAD=$(ls /opt/rir/external/clang*/lib/clang/12.0.0/lib/linux/libclang_rt.asan-x86_64.so) bin/tests
+    - ASAN_OPTIONS="intercept_tls_get_addr=0" 
+      LSAN_OPTIONS="symbolize=1" 
+      ASAN_SYMBOLIZER_PATH=$CLANG_DIR/bin/llvm-symbolizer
+      R_LD_PRELOAD=$CLANG_DIR/lib/clang/16/lib/x86_64-unknown-linux-gnu/libclang_rt.asan.so
+      bin/tests
   # sometimes leak sanitizer segfaults
   retry: 2
 
+# Test the compiler server and client (on localhost)
+test_compiler_server_client:
+  image: registry.gitlab.com/rirvm/rir_mirror:$CI_COMMIT_SHA
+  variables:
+    GIT_STRATEGY: none
+    PIR_LLVM_OPT_LEVEL: 0
+  stage: Run tests
+  needs:
+    - rir_container
+  except:
+    - schedules
+  script:
+    - mkdir $CI_PROJECT_DIR/results && mkdir $CI_PROJECT_DIR/results/debug && mkdir $CI_PROJECT_DIR/results/release
+    - curl 10.200.14.25:8080/clang+llvm-12.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz > /opt/rir/external/clang+llvm-12.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz
+    - /opt/rir/tools/fetch-llvm.sh
+    - mkdir /opt/rir/build/debug && cd /opt/rir/build/debug && cmake -DCMAKE_BUILD_TYPE=Debug ../.. && make -j6
+    - PIR_CLIENT_SKIP_DISCREPANCY_CHECK=1 ./bin/test-compiler-client-and-server; cp /tmp/test-compiler-server-actual.out /tmp/test-compiler-client-actual.out $CI_PROJECT_DIR/results/debug/
+    - cd /opt/rir/build/release
+    - PIR_CLIENT_SKIP_DISCREPANCY_CHECK=1 ./bin/test-compiler-client-and-server; cp /tmp/test-compiler-server-actual.out /tmp/test-compiler-client-actual.out $CI_PROJECT_DIR/results/release/
+  artifacts:
+    paths:
+      - results
+    when: always
+    expire_in: 1 week
+
 # Test the benchmarks container before deploying
 test_benchmarks:
   image: registry.gitlab.com/rirvm/rir_mirror/benchmark:$CI_COMMIT_SHA

.gitmodules

@@ -2,3 +2,6 @@
 	path = external/custom-r
 	url = https://github.com/reactorlabs/gnur.git
 	ignore = untracked
+[submodule "external/xxHash"]
+	path = external/xxHash
+	url = https://github.com/Cyan4973/xxHash.git

CMakeLists.txt

@@ -8,6 +8,8 @@ set(R_LIBRARY_TREE ${CMAKE_SOURCE_DIR}/packages)
 set(R_ROOT_DIR ${R_HOME})
 set(R_INCLUDE_DIR ${R_HOME}/include)
 set(LLVM_DIR ${CMAKE_SOURCE_DIR}/external/llvm-12)
+set(ZEROMQ_DIR ${CMAKE_SOURCE_DIR}/external/zeromq)
+set(XXHASH_DIR ${CMAKE_SOURCE_DIR}/external/xxHash)
 
 set(R_COMMAND ${R_HOME}/bin/R)
 
@@ -22,29 +24,28 @@ endif ()
 include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
 add_definitions(${LLVM_DEFINITIONS})
 
-# use GCC 9 on macOS. Otherwise we use clang
-if(APPLE)
-    option(MACOS_USE_GCC_9 "Use GCC 9 on macOS." FALSE)
-endif(APPLE)
+include_directories(${ZEROMQ_DIR}/include)
+# Won't work on Linux if we try to link statically:
+#     /usr/bin/ld: ../external/zeromq/lib/libzmq.a(libzmq_la-zmq.o): relocation R_X86_64_PC32 against symbol
+#     `_ZSt7nothrow@@GLIBCXX_3.4' can not be used when making a shared object; recompile with -fPIC
+if (${APPLE})
+    link_libraries(${ZEROMQ_DIR}/lib/libzmq.dylib)
+else ()
+    link_libraries(${ZEROMQ_DIR}/lib/libzmq.so)
+endif ()
 
-if(${MACOS_USE_GCC_9})
-    set(CMAKE_C_COMPILER /usr/local/bin/gcc-9 CACHE PATH "" FORCE)
-    set(CMAKE_CXX_COMPILER /usr/local/bin/g++-9 CACHE PATH "" FORCE)
-endif()
+set(XXHASH_BUILD_XXHSUM OFF)
+set(BUILD_SHARED_LIBS ON)
+add_subdirectory(${XXHASH_DIR}/cmake_unofficial/ ${XXHASH_DIR}/build/ EXCLUDE_FROM_ALL)
 
 add_definitions(-g)
 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -Werror -DSWITCH_TO_NAMED=1")
 set(CMAKE_CXX_FLAGS_RELEASENOASSERT "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
 set(CMAKE_CXX_FLAGS_FULLVERIFIER "${CMAKE_CXX_FLAGS_RELEASE} -DFULLVERIFIER")
 set(CMAKE_CXX_FLAGS_RELEASESLOWASSERT "${CMAKE_CXX_FLAGS_RELEASE} -DENABLE_SLOWASSERT")
-set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DSWITCH_TO_NAMED=1 -DENABLE_SLOWASSERT")
+set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DSWITCH_TO_NAMED=1 -DENABLE_SLOWASSERT -DDEBUG_DISASSEMBLY")
 set(CMAKE_CXX_FLAGS_DEBUGOPT "-Og -DSWITCH_TO_NAMED=1 -DENABLE_SLOWASSERT")
-# with macOS GCC 9 we need to explicitly use libc++, since llvm does. See https://libcxx.llvm.org/docs/UsingLibcxx.html#using-libc-with-gcc
-if(${MACOS_USE_GCC_9})
-    set(CMAKE_CXX_FLAGS_LIBCXX "-nostdinc++ -nodefaultlibs -lc++ -lc++abi -lm -lc -lgcc_s.1 -lgcc")
-else()
-    set(CMAKE_CXX_FLAGS_LIBCXX "")
-endif()
+set(CMAKE_CXX_FLAGS_LIBCXX "")
 set(CMAKE_CXX_FLAGS "${LLVM_CXX_FLAGS} ${CMAKE_CXX_FLAGS_LIBCXX} -Wall -Wuninitialized -Wundef -Winit-self -Wcast-align -Woverloaded-virtual -Wmissing-include-dirs -Wstrict-overflow=3 -std=c++14 -fno-rtti -fno-exceptions -Wimplicit-fallthrough -Wno-deprecated-declarations")
 set(CMAKE_C_FLAGS_RELEASE "-O2 -DSWITCH_TO_NAMED=1")
 set(CMAKE_C_FLAGS_RELEASENOASSERT "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
@@ -54,8 +55,16 @@ set(CMAKE_C_FLAGS_DEBUG "-O0 -DSWITCH_TO_NAMED=1 -DENABLE_SLOWASSERT")
 set(CMAKE_C_FLAGS_DEBUGOPT "-Og -DSWITCH_TO_NAMED=1 -DENABLE_SLOWASSERT")
 set(CMAKE_C_FLAGS "-std=gnu99")
 
-set(CMAKE_CXX_FLAGS_SANITIZE "${CMAKE_CXX_FLAGS_RELEASE} -g2 -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=address -fsanitize=leak -fno-sanitize=alignment -shared-libasan -fvisibility=default")
-set(CMAKE_C_FLAGS_SANITIZE "${CMAKE_C_FLAGS_RELEASE} -g2 -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=address -fsanitize=leak -fno-sanitize=alignment -shared-libasan -fvisibility=default")
+if (${APPLE})
+    set(SANITIZE_FLAGS "-g2 -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=address -fno-sanitize=alignment -shared-libasan -fvisibility=default")
+else()
+    set(SANITIZE_FLAGS "-g2 -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=address -fsanitize=leak -fno-sanitize=alignment -shared-libasan -fvisibility=default")
+endif()
+set(CMAKE_CXX_FLAGS_SANITIZE "${CMAKE_CXX_FLAGS_RELEASE} ${SANITIZE_FLAGS}")
+set(CMAKE_C_FLAGS_SANITIZE "${CMAKE_C_FLAGS_RELEASE} ${SANITIZE_FLAGS}")
+set(CMAKE_CXX_FLAGS_DEBUG_SANITIZE "${CMAKE_CXX_FLAGS_DEBUG} ${SANITIZE_FLAGS}")
+set(CMAKE_C_FLAGS_DEBUG_SANITIZE "${CMAKE_C_FLAGS_DEBUG} ${SANITIZE_FLAGS}")
+
 
 MARK_AS_ADVANCED(
     CMAKE_CXX_FLAGS_SANITIZE
@@ -96,12 +105,15 @@ endif()
 
 # Create proxy scripts for the scripts in /tools
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.bin_create")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/tests"           "#!/bin/sh\nRIR_BUILD=\"${CMAKE_CURRENT_BINARY_DIR}\" ${CMAKE_SOURCE_DIR}/tools/tests \"$@\"")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/R"               "#!/bin/sh\nRIR_BUILD=\"${CMAKE_CURRENT_BINARY_DIR}\" ${CMAKE_SOURCE_DIR}/tools/R \"$@\"")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/Rscript"         "#!/bin/sh\nRIR_BUILD=\"${CMAKE_CURRENT_BINARY_DIR}\" ${CMAKE_SOURCE_DIR}/tools/Rscript \"$@\"")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/Rgnu"            "#!/bin/sh\n${CMAKE_SOURCE_DIR}/external/custom-r/bin/R \"$@\"")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/gnur-make"       "#!/bin/sh\nRIR_BUILD=\"${CMAKE_CURRENT_BINARY_DIR}\" ${CMAKE_SOURCE_DIR}/tools/gnur-make \"$@\"")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/gnur-make-tests" "#!/bin/sh\nRIR_BUILD=\"${CMAKE_CURRENT_BINARY_DIR}\" ${CMAKE_SOURCE_DIR}/tools/gnur-make-tests \"$@\"")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/tests"                           "#!/bin/sh\nRIR_BUILD=\"${CMAKE_CURRENT_BINARY_DIR}\" ${CMAKE_SOURCE_DIR}/tools/tests \"$@\"")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/test-compiler-client-and-server" "#!/bin/sh\nRIR_BUILD=\"${CMAKE_CURRENT_BINARY_DIR}\" ${CMAKE_SOURCE_DIR}/tools/test-compiler-client-and-server \"$@\"")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/test-compiler-client-only"       "#!/bin/sh\nRIR_BUILD=\"${CMAKE_CURRENT_BINARY_DIR}\" ${CMAKE_SOURCE_DIR}/tools/test-compiler-client-only \"$@\"")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/test-compiler-server-only"       "#!/bin/sh\nRIR_BUILD=\"${CMAKE_CURRENT_BINARY_DIR}\" ${CMAKE_SOURCE_DIR}/tools/test-compiler-server-only \"$@\"")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/R"                               "#!/bin/sh\nRIR_BUILD=\"${CMAKE_CURRENT_BINARY_DIR}\" ${CMAKE_SOURCE_DIR}/tools/R \"$@\"")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/Rscript"                         "#!/bin/sh\nRIR_BUILD=\"${CMAKE_CURRENT_BINARY_DIR}\" ${CMAKE_SOURCE_DIR}/tools/Rscript \"$@\"")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/Rgnu"                            "#!/bin/sh\n${CMAKE_SOURCE_DIR}/external/custom-r/bin/R \"$@\"")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/gnur-make"                       "#!/bin/sh\nRIR_BUILD=\"${CMAKE_CURRENT_BINARY_DIR}\" ${CMAKE_SOURCE_DIR}/tools/gnur-make \"$@\"")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/gnur-make-tests"                 "#!/bin/sh\nRIR_BUILD=\"${CMAKE_CURRENT_BINARY_DIR}\" ${CMAKE_SOURCE_DIR}/tools/gnur-make-tests \"$@\"")
 
 file(GLOB BIN_IN "${CMAKE_CURRENT_BINARY_DIR}/.bin_create/*")
 file(INSTALL ${BIN_IN} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/bin" FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ GROUP_READ GROUP_EXECUTE)
@@ -118,36 +130,20 @@ endif(${NO_LOCAL_CONFIG})
 
 include_directories(${R_INCLUDE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/rir/src)
-# again we need to explicitly use libc++
-if(${MACOS_USE_GCC_9})
-    include_directories(/Library/Developer/CommandLineTools/usr/include/c++/v1)
-endif(${MACOS_USE_GCC_9})
 message(STATUS "Using R from ${R_HOME}")
 
 add_custom_target(setup-build-dir
     COMMAND ${CMAKE_SOURCE_DIR}/tools/setup-build-dir ${CMAKE_SOURCE_DIR} ${R_HOME}
 )
 
-if(${MACOS_USE_GCC_9})
-    add_custom_target(dependencies
-        COMMAND ${CMAKE_SOURCE_DIR}/tools/build-gnur.sh --macos_gcc9
-        COMMAND ${CMAKE_SOURCE_DIR}/tools/fetch-llvm.sh --macos_gcc9
-    )
-else()
-    add_custom_target(dependencies
-        COMMAND ${CMAKE_SOURCE_DIR}/tools/build-gnur.sh
-        COMMAND ${CMAKE_SOURCE_DIR}/tools/fetch-llvm.sh
-    )
-endif()
-
-add_custom_target(default-gnur
-    DEPENDS dependencies
-    COMMAND ${CMAKE_SOURCE_DIR}/tools/build-gnur.sh custom-r
+add_custom_target(dependencies
+    COMMAND ${CMAKE_SOURCE_DIR}/tools/build-gnur.sh
+    COMMAND ${CMAKE_SOURCE_DIR}/tools/build-zeromq.sh
+    COMMAND ${CMAKE_SOURCE_DIR}/tools/fetch-llvm.sh
 )
 
 add_custom_target(setup
     DEPENDS dependencies
-    DEPENDS default-gnur
 )
 
 add_custom_target(tests
@@ -175,10 +171,17 @@ if (DEFINED LLVM_PACKAGE_VERSION)
   target_link_libraries(${PROJECT_NAME} ${LLVM_LIBS})
 endif(DEFINED LLVM_PACKAGE_VERSION)
 
+target_link_libraries(${PROJECT_NAME} xxHash::xxhash)
+
 if(APPLE)
     set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-L${R_HOME}/lib")
     target_link_libraries(${PROJECT_NAME} R)
     # to resolve build error from
     # https://www.gnu.org/software/gettext/FAQ.html#integrating_undefined
-    target_link_libraries(${PROJECT_NAME} -lintl)
+    # target_link_libraries(${PROJECT_NAME} -lintl)
+    include_directories(${LLVM_DIR}/include)
+    target_link_directories(${PROJECT_NAME} INTERFACE ${LLVM_DIR}/lib)
+    # Note: May need to update the version here
+    include_directories(/opt/homebrew/Cellar/gettext/0.21.1/include)
+    target_link_libraries(${PROJECT_NAME} /opt/homebrew/Cellar/gettext/0.21.1/lib/libintl.dylib)
 endif(APPLE)

Dockerfile

@@ -5,13 +5,16 @@ ENV LANG en_US.UTF-8
 RUN echo $CI_COMMIT_SHA > /opt/rir_version && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade -y -qq && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y -qq curl git gcc gfortran g++ libreadline-dev libx11-dev libxt-dev zlib1g-dev libbz2-dev liblzma-dev libpcre3-dev libcurl4-openssl-dev libcairo2-dev make libreadline8 libncurses-dev xz-utils cmake tcl-dev tk-dev locales rsync && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y -qq curl git gcc gfortran g++ libreadline-dev libx11-dev libxt-dev zlib1g-dev libbz2-dev liblzma-dev libpcre3-dev libcurl4-openssl-dev libcairo2-dev make libreadline8 libncurses-dev xz-utils cmake tcl-dev tk-dev locales rsync wget && \
     locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 && \
     cd /opt/rir && \
     tools/build-gnur.sh && \
     rm -rf external/custom-r/cache_recommended.tar .git && \
     find external -type f -name '*.o' -exec rm -f {} \; && \
     apt-get clean
+RUN cd /opt/rir && \
+    USE_NINJA=0 tools/build-zeromq.sh && \
+    rm -rf external/zeromq-* external/cppzmq-*
 RUN mkdir -p /opt/rir/build/release && \
     cd /opt/rir && \
     (curl 10.200.14.25:8080/clang+llvm-12.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz > external/clang+llvm-12.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz || true) && \