Symbolize multiple LHS consts

CMakeLists.txt

@@ -11,7 +11,7 @@ endif()
 if (NOT LLVM_BUILD_TYPE)
   set(LLVM_BUILD_TYPE ${CMAKE_BUILD_TYPE})
 endif()
-set(LLVM_CONFIG_EXECUTABLE ${CMAKE_SOURCE_DIR}/third_party/llvm-${LLVM_BUILD_TYPE}-install/bin/llvm-config)
+set(LLVM_CONFIG_EXECUTABLE ${CMAKE_SOURCE_DIR}/third_party/llvm-Release-install/bin/llvm-config)
 if(NOT EXISTS ${LLVM_CONFIG_EXECUTABLE})
   message(FATAL_ERROR "llvm-config could not be found!")
 endif()
@@ -28,7 +28,7 @@ execute_process(
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-set(LLVM_CXXFLAGS "${LLVM_CXXFLAGS} -fno-exceptions -fno-rtti")
+set(LLVM_CXXFLAGS "${LLVM_CXXFLAGS} -fno-exceptions -fno-rtti -Wno-deprecated-enum-enum-conversion")
 
 execute_process(
   COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs
@@ -84,10 +84,10 @@ set(GTEST_CXXFLAGS "-DGTEST_HAS_RTTI=0")
 set(GTEST_INCLUDEDIR "${LLVM_SRC}/utils/unittest/googletest/include")
 set(GTEST_LIBS "-lgtest_main -lgtest")
 
-set(LLVM_CXXFLAGS "${LLVM_CXXFLAGS} -std=c++17")
+set(LLVM_CXXFLAGS "${LLVM_CXXFLAGS} -std=c++20")
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++17")
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++20")
   set(LLVM_CXXFLAGS "${LLVM_CXXFLAGS} -fvisibility-inlines-hidden")
   set(PASS_LDFLAGS "-Wl,-undefined,dynamic_lookup")
 endif()
@@ -129,11 +129,32 @@ find_library(HIREDIS_LIBRARY
   third_party/hiredis-install/lib
   NO_DEFAULT_PATH)
 
-find_library(ALIVE_LIBRARY alive2 PATHS "${ALIVE_BUILDDIR}" NO_DEFAULT_PATH)
-if (ALIVE_LIBRARY)
-  message(STATUS "Alive2: ${ALIVE_LIBRARY}")
+find_library(ALIVE_IR ir PATHS "${ALIVE_BUILDDIR}" NO_DEFAULT_PATH)
+if (ALIVE_IR)
+  message(STATUS "Alive2 IR")
 else()
-  message(SEND_ERROR "Alive2 not found")
+  message(SEND_ERROR "Alive2 libir.a not found")
+endif()
+
+find_library(ALIVE_SMT smt PATHS "${ALIVE_BUILDDIR}" NO_DEFAULT_PATH)
+if (ALIVE_SMT)
+  message(STATUS "Alive2 SMT")
+else()
+  message(SEND_ERROR "Alive2 libsmt.a not found")
+endif()
+
+find_library(ALIVE_TOOLS tools PATHS "${ALIVE_BUILDDIR}" NO_DEFAULT_PATH)
+if (ALIVE_TOOLS)
+  message(STATUS "Alive2 TOOLS")
+else()
+  message(SEND_ERROR "Alive2 libtools.a not found")
+endif()
+
+find_library(ALIVE_UTIL util PATHS "${ALIVE_BUILDDIR}" NO_DEFAULT_PATH)
+if (ALIVE_UTIL)
+  message(STATUS "Alive2 UTIL")
+else()
+  message(SEND_ERROR "Alive2 libutil.a not found")
 endif()
 
 set(Z3 "${CMAKE_SOURCE_DIR}/third_party/z3-install/bin/z3")
@@ -147,6 +168,8 @@ else()
   message(SEND_ERROR "Z3 shared lib not found")
 endif()
 
+set(ALIVE_LIBRARY ${ALIVE_IR} ${ALIVE_SMT} ${ALIVE_TOOLS} ${ALIVE_UTIL} ${Z3_LIBRARY})
+
 set(SOUPER_CLANG_TOOL_FILES
   lib/ClangTool/Actions.cpp
   include/souper/ClangTool/Actions.h
@@ -195,12 +218,23 @@ set(SOUPER_INFER_FILES
   include/souper/Infer/Interpreter.h
   lib/Infer/Preconditions.cpp
   include/souper/Infer/Preconditions.h
+  lib/Infer/SynthUtils.cpp
+  include/souper/Infer/SynthUtils.h
 )
 
 add_library(souperInfer STATIC
   ${SOUPER_INFER_FILES}
 )
 
+set(SOUPER_GENERALIZE_FILES
+  lib/Generalize/Reducer.cpp
+  include/souper/Generalize/Reducer.h
+)
+
+add_library(souperGeneralize STATIC
+  ${SOUPER_GENERALIZE_FILES}
+)
+
 set(SOUPER_INST_FILES
   lib/Inst/Inst.cpp
   include/souper/Inst/Inst.h
@@ -239,19 +273,26 @@ add_library(souperTool STATIC
   ${SOUPER_TOOL_FILES}
 )
 
+set(SOUPER_CODEGEN_FILES
+  lib/Codegen/Codegen.cpp
+  lib/Codegen/MachineCost.cpp
+  include/souper/Codegen/Codegen.h
+)
+
+add_library(souperCodegen STATIC
+  ${SOUPER_CODEGEN_FILES}
+)
+
 set(SOUPER_SOURCES
   ${SOUPER_EXTRACTOR_FILES}
   ${SOUPER_INST_FILES}
   ${SOUPER_KVSTORE_FILES}
   ${SOUPER_PARSER_FILES}
   ${SOUPER_SMTLIB2_FILES}
   ${SOUPER_TOOL_FILES}
-  ${SOUPER_INFER_FILES})
-
-set(SOUPER_CODEGEN_FILES
-  lib/Codegen/Codegen.cpp
-  include/souper/Codegen/Codegen.h
-)
+  ${SOUPER_INFER_FILES}
+  ${SOUPER_GENERALIZE_FILES}
+  ${SOUPER_CODEGEN_FILES})
 
 add_library(souperPass SHARED
   ${KLEE_EXPR_FILES}
@@ -265,10 +306,6 @@ add_library(souperPassProfileAll SHARED
   lib/Pass/Pass.cpp
 )
 
-add_library(souperCodegen SHARED
-  ${SOUPER_CODEGEN_FILES}
-)
-
 target_compile_definitions(souperPassProfileAll PRIVATE DYNAMIC_PROFILE_ALL=1)
 
 add_executable(clang-souper
@@ -295,6 +332,14 @@ add_executable(souper-check
   tools/souper-check.cpp
 )
 
+add_executable(generalize
+  tools/generalize.cpp
+)
+
+add_executable(matcher-gen
+  tools/matcher-gen.cpp
+)
+
 add_executable(souper-interpret
   tools/souper-interpret.cpp
 )
@@ -319,6 +364,10 @@ add_executable(parser_tests
   unittests/Parser/ParserTests.cpp
 )
 
+add_executable(codegen_tests
+  unittests/Codegen/CodegenTests.cpp
+)
+
 add_executable(interpreter_tests
   unittests/Interpreter/InterpreterInfra.cpp
   unittests/Interpreter/InterpreterTests.cpp)
@@ -362,8 +411,8 @@ configure_file(
 )
 
 foreach(target souper internal-solver-test lexer-test parser-test souper-check count-insts
-               souper2llvm souper-interpret
-               souperExtractor souperInfer souperInst souperKVStore souperParser
+               souper2llvm souper-interpret generalize matcher-gen
+               souperExtractor souperInfer souperGeneralize souperInst souperKVStore souperParser
                souperSMTLIB2 souperTool souperPass souperPassProfileAll kleeExpr
                souperCodegen)
   set_target_properties(${target} PROPERTIES COMPILE_FLAGS "${LLVM_CXXFLAGS}")
@@ -373,40 +422,45 @@ foreach(target souperClangTool clang-souper)
   set_target_properties(${target} PROPERTIES COMPILE_FLAGS "${CLANG_CXXFLAGS} ${LLVM_CXXFLAGS}")
   target_include_directories(${target} PRIVATE "${LLVM_INCLUDEDIR}" ${CLANG_INCLUDEDIR})
 endforeach()
-foreach(target extractor_tests inst_tests parser_tests interpreter_tests bulk_tests)
+foreach(target extractor_tests inst_tests parser_tests interpreter_tests bulk_tests codegen_tests)
   set_target_properties(${target} PROPERTIES COMPILE_FLAGS "${GTEST_CXXFLAGS} ${LLVM_CXXFLAGS}")
   target_include_directories(${target} PRIVATE "${LLVM_INCLUDEDIR}" "${GTEST_INCLUDEDIR}")
 endforeach()
 
 # static
 target_link_libraries(kleeExpr ${LLVM_LIBS} ${LLVM_LDFLAGS})
 target_link_libraries(souperClangTool souperExtractor souperTool ${CLANG_LIBS} ${LLVM_LIBS} ${LLVM_LDFLAGS})
-target_link_libraries(souperExtractor souperParser souperKVStore souperInfer souperInst kleeExpr)
+target_link_libraries(souperExtractor souperParser souperKVStore souperInfer souperInst kleeExpr souperCodegen)
 target_link_libraries(souperInfer souperExtractor ${LLVM_LIBS} ${LLVM_LDFLAGS} ${Z3_LIBRARY})
+target_link_libraries(souperGeneralize souperInfer ${LLVM_LIBS} ${LLVM_LDFLAGS} ${Z3_LIBRARY})
 target_link_libraries(souperInst ${LLVM_LIBS} ${LLVM_LDFLAGS})
 target_link_libraries(souperKVStore ${HIREDIS_LIBRARY} ${LLVM_LIBS} ${LLVM_LDFLAGS})
 target_link_libraries(souperParser souperInst ${LLVM_LIBS} ${LLVM_LDFLAGS} ${ALIVE_LIBRARY})
 target_link_libraries(souperSMTLIB2 ${LLVM_LIBS} ${LLVM_LDFLAGS})
 target_link_libraries(souperTool souperExtractor souperSMTLIB2)
+target_link_libraries(souperCodegen ${LLVM_LIBS} ${LLVM_LDFLAGS})
 
 # dynamic
 target_link_libraries(souperCodegen ${PASS_LDFLAGS})
-target_link_libraries(souperPass souperCodegen ${PASS_LDFLAGS} ${HIREDIS_LIBRARY} ${ALIVE_LIBRARY} ${Z3_LIBRARY})
-target_link_libraries(souperPassProfileAll souperCodegen ${PASS_LDFLAGS} ${HIREDIS_LIBRARY} ${ALIVE_LIBRARY} ${Z3_LIBRARY})
+target_link_libraries(souperPass ${PASS_LDFLAGS} ${HIREDIS_LIBRARY} ${ALIVE_LIBRARY} ${Z3_LIBRARY})
+target_link_libraries(souperPassProfileAll ${PASS_LDFLAGS} ${HIREDIS_LIBRARY} ${ALIVE_LIBRARY} ${Z3_LIBRARY})
 
 # executables
 target_link_libraries(souper souperExtractor souperKVStore souperParser souperSMTLIB2 souperTool kleeExpr ${HIREDIS_LIBRARY} ${ALIVE_LIBRARY} ${Z3_LIBRARY})
 target_link_libraries(internal-solver-test souperSMTLIB2)
 target_link_libraries(lexer-test souperParser)
 target_link_libraries(parser-test souperParser)
 target_link_libraries(souper-check souperTool souperExtractor souperKVStore souperSMTLIB2 souperParser ${HIREDIS_LIBRARY} ${ALIVE_LIBRARY} ${Z3_LIBRARY})
+target_link_libraries(generalize souperTool souperExtractor souperKVStore souperSMTLIB2 souperParser souperInfer souperGeneralize ${HIREDIS_LIBRARY} ${ALIVE_LIBRARY} ${Z3_LIBRARY})
+target_link_libraries(matcher-gen souperTool souperExtractor souperKVStore souperSMTLIB2 souperParser ${HIREDIS_LIBRARY} ${ALIVE_LIBRARY} ${Z3_LIBRARY})
 target_link_libraries(souper-interpret souperTool souperExtractor souperKVStore souperSMTLIB2 souperParser ${HIREDIS_LIBRARY} ${ALIVE_LIBRARY} ${Z3_LIBRARY})
 target_link_libraries(clang-souper souperClangTool souperExtractor souperKVStore souperParser souperSMTLIB2 souperTool kleeExpr ${CLANG_LIBS} ${LLVM_LIBS} ${LLVM_LDFLAGS} ${HIREDIS_LIBRARY} ${ALIVE_LIBRARY} ${Z3_LIBRARY})
 target_link_libraries(count-insts souperParser)
 target_link_libraries(souper2llvm souperParser souperCodegen)
 target_link_libraries(extractor_tests souperExtractor souperParser ${GTEST_LIBS} ${ALIVE_LIBRARY})
 target_link_libraries(inst_tests souperInfer souperPass souperInst souperExtractor ${GTEST_LIBS} ${ALIVE_LIBRARY})
 target_link_libraries(parser_tests souperParser ${GTEST_LIBS} ${ALIVE_LIBRARY})
+target_link_libraries(codegen_tests souperCodegen souperInst ${GTEST_LIBS} ${ALIVE_LIBRARY})
 target_link_libraries(interpreter_tests souperInfer souperInst ${GTEST_LIBS} ${ALIVE_LIBRARY})
 target_link_libraries(bulk_tests souperInfer souperInst ${GTEST_LIBS} ${ALIVE_LIBRARY} ${Z3_LIBRARY})
 
@@ -436,27 +490,12 @@ configure_file(
 
 add_custom_target(check
   COMMAND ${CMAKE_BINARY_DIR}/run_lit
-  DEPENDS extractor_tests inst_tests parser-test parser_tests profileRuntime souper souper-check souper-interpret souperPass souper2llvm souperPassProfileAll count-insts interpreter_tests bulk_tests
+  DEPENDS extractor_tests inst_tests parser-test parser_tests profileRuntime souper souper-check souper-interpret souperPass souper2llvm souperPassProfileAll count-insts interpreter_tests bulk_tests codegen_tests
   USES_TERMINAL)
 
 # we want assertions even in release mode!
 string(REPLACE "-DNDEBUG" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
 
-find_program(GO_EXECUTABLE NAMES go DOC "go executable")
-if(NOT GO_EXECUTABLE STREQUAL "GO_EXECUTABLE-NOTFOUND")
-  add_executable(souperweb-backend
-    tools/souperweb-backend.cpp
-  )
-  set_target_properties(souperweb-backend
-    PROPERTIES COMPILE_FLAGS "${LLVM_CXXFLAGS}")
-  target_include_directories(souperweb-backend PRIVATE "${LLVM_INCLUDEDIR}")
-
-  target_link_libraries(souperweb-backend souperTool souperExtractor souperPass souperKVStore souperSMTLIB2 souperParser souperInst ${HIREDIS_LIBRARY})
-
-  add_custom_target(souperweb ALL COMMAND ${GO_EXECUTABLE} build -o ${CMAKE_BINARY_DIR}/souperweb ${CMAKE_SOURCE_DIR}/tools/souperweb.go
-                                  COMMENT "Building souperweb")
-endif()
-
 add_library(profileRuntime STATIC
   runtime/souperPassProfile.c)
 
@@ -472,8 +511,10 @@ configure_file(${CMAKE_SOURCE_DIR}/utils/py_souper2llvm.in ${CMAKE_BINARY_DIR}/p
 configure_file(${CMAKE_SOURCE_DIR}/include/souper/Tool/GetSolver.h.in ${CMAKE_BINARY_DIR}/include/souper/Tool/GetSolver.h @ONLY)
 
 if (BUILD_CLANG_TOOL)
-  configure_file(${CMAKE_SOURCE_DIR}/utils/sclang.in ${CMAKE_BINARY_DIR}/sclang @ONLY)
-  configure_file(${CMAKE_SOURCE_DIR}/utils/sclang.in ${CMAKE_BINARY_DIR}/sclang++ @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/utils/sclang.in ${CMAKE_BINARY_DIR}/sclang @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/utils/sclang.in ${CMAKE_BINARY_DIR}/sclang++ @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/utils/mclang.in ${CMAKE_BINARY_DIR}/mclang @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/utils/mclang.in ${CMAKE_BINARY_DIR}/mclang++ @ONLY)
 endif()
 
 add_subdirectory(docs)

Dockerfile

@@ -1,34 +1,24 @@
 from ubuntu:20.04
 
 run set -x; \
-        echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \
-        && apt-get update -y -qq \
-        && apt-get dist-upgrade -y -qq \
-        && apt-get autoremove -y -qq \
-        && apt-get remove -y -qq clang llvm llvm-runtime \
-	&& apt-get install libgmp10 \
-	&& echo 'ca-certificates valgrind libc6-dev libgmp-dev cmake ninja-build make autoconf automake libtool golang-go python subversion re2c git clang' > /usr/src/build-deps \
-	&& apt-get install -y $(cat /usr/src/build-deps) --no-install-recommends \
-	&& git clone https://github.com/antirez/redis /usr/src/redis
-
-run export CC=clang CXX=clang++ \
-        && cd /usr/src/redis \
-	&& git checkout 5.0.3 \
-	&& make -j10 \
-	&& make install
-
-run export GOPATH=/usr/src/go \
-	&& go get github.com/gomodule/redigo/redis
+    echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \
+    && apt-get update -y -qq \
+    && apt-get dist-upgrade -y -qq \
+    && apt-get autoremove -y -qq \
+    && apt-get remove -y -qq clang llvm llvm-runtime \
+    && apt-get install libgmp10 \
+    && echo 'ca-certificates valgrind libc6-dev libgmp-dev cmake ninja-build make autoconf automake libtool python python3 subversion re2c git clang libstdc++-10-dev redis' > /usr/src/build-deps \
+    && apt-get install -y $(cat /usr/src/build-deps) --no-install-recommends
 
 add build_deps.sh /usr/src/souper/build_deps.sh
 add clone_and_test.sh /usr/src/souper/clone_and_test.sh
 
 run export CC=clang CXX=clang++ \
-	&& cd /usr/src/souper \
-#	&& ./build_deps.sh Debug \
-#	&& rm -r third_party/llvm-Debug-build \
-	&& ./build_deps.sh Release \
-	&& rm -r third_party/llvm-Release-build
+    && cd /usr/src/souper \
+#   && ./build_deps.sh Debug \
+#   && rm -r third_party/llvm-Debug-build \
+    && ./build_deps.sh Release \
+    && rm -r third_party/llvm-Release-build
 
 
 add CMakeLists.txt /usr/src/souper/CMakeLists.txt
@@ -41,19 +31,16 @@ add tools /usr/src/souper/tools
 add utils /usr/src/souper/utils
 add unittests /usr/src/souper/unittests
 
-run export GOPATH=/usr/src/go \
-        && export LD_LIBRARY_PATH=/usr/src/souper/third_party/z3-install/lib:$LD_LIBRARY_PATH \
-	&& mkdir -p /usr/src/souper-build \
-	&& cd /usr/src/souper-build \
-	&& CC=/usr/src/souper/third_party/llvm-Release-install/bin/clang CXX=/usr/src/souper/third_party/llvm-Release-install/bin/clang++ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DTEST_SYNTHESIS=ON ../souper \
-	&& ninja souperweb souperweb-backend \
-        && ninja check \
-	&& cp souperweb souperweb-backend /usr/local/bin \
-        && cd .. \
-        && rm -rf /usr/src/souper-build \
-	&& strip /usr/local/bin/* \
-	&& groupadd -r souper \
-	&& useradd -m -r -g souper souper \
-	&& mkdir /data \
-	&& chown souper:souper /data \
-	&& rm -rf /usr/local/include /usr/local/lib/*.a /usr/local/lib/*.la
+run export LD_LIBRARY_PATH=/usr/src/souper/third_party/z3-install/lib:$LD_LIBRARY_PATH \
+    && mkdir -p /usr/src/souper-build \
+    && cd /usr/src/souper-build \
+    && CC=/usr/src/souper/third_party/llvm-Release-install/bin/clang CXX=/usr/src/souper/third_party/llvm-Release-install/bin/clang++ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DTEST_SYNTHESIS=ON ../souper \
+    && ninja \
+    && ninja check \
+    && cd .. \
+    && rm -rf /usr/src/souper-build \
+    && groupadd -r souper \
+    && useradd -m -r -g souper souper \
+    && mkdir /data \
+    && chown souper:souper /data \
+    && rm -rf /usr/local/include /usr/local/lib/*.a /usr/local/lib/*.la

README.md

@@ -1,6 +1,8 @@
 Souper is a superoptimizer for LLVM IR. It uses an SMT solver to help identify
 missing peephole optimizations in LLVM's midend optimizers.
 
+The architecture and concepts of Souper are described in [Souper: A synthesizing superoptimizer](https://arxiv.org/pdf/1711.04422.pdf).
+
 # Requirements
 
 Souper should work on any reasonably modern Linux or OS X machine.
@@ -11,11 +13,6 @@ http://llvm.org/docs/GettingStarted.html#getting-a-modern-host-c-toolchain
 
 You will also need CMake to build Souper and its dependencies.
 
-If you have Go installed, you will also need the Redigo Redis client:
-```
-$ go get github.com/gomodule/redigo/redis
-```
-
 # Building Souper
 
 1. Download and build dependencies: