changes to test to work with ir2vec submodule changes

Author: pranav-159

src/CMakeLists.txt

@@ -9,77 +9,86 @@ set(binsrc CollectIR.cpp IR2Vec.cpp)
 file(GLOB RESOURCE_FILES ../vocabulary/seedEmbeddingVocab.txt)
 
 option(LLVM_IR2VEC "where to enable IR2Vec as subproject for LLVM" OFF)
+
 if(NOT LLVM_IR2VEC)
-set(LT_LLVM_INSTALL_DIR "" CACHE PATH "LLVM installation directory")
-list(APPEND CMAKE_PREFIX_PATH "${LT_LLVM_INSTALL_DIR}/lib/cmake/llvm/")
-
-find_package(LLVM 17.0.0 REQUIRED CONFIG)
-message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
-message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
-
-include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
-# llvm_map_components_to_libnames(llvm_libs all)
-llvm_map_components_to_libnames(llvm_libs support core irreader analysis TransformUtils)
-
-add_executable(${PROJECT_NAME} ${binsrc})
-target_link_libraries (${PROJECT_NAME} ${llvm_libs} objlib)
-target_include_directories(${PROJECT_NAME} PRIVATE .)
-
-add_library(objlib OBJECT ${libsrc})
-set_property(TARGET objlib PROPERTY POSITION_INDEPENDENT_CODE 1)
-target_link_libraries (objlib Eigen3::Eigen)
-
-add_library(${IR2VEC_LIB} SHARED $<TARGET_OBJECTS:objlib>)
-add_library(${IR2VEC_LIB_STATIC} STATIC $<TARGET_OBJECTS:objlib>)
-set_target_properties(${IR2VEC_LIB} ${IR2VEC_LIB_STATIC} PROPERTIES
-    VERSION ${PROJECT_VERSION}
-    SOVERSION 1
-    PUBLIC_HEADER "./include/IR2Vec.h"
-    RESOURCE ${RESOURCE_FILES}
-    OUTPUT_NAME ${IR2VEC_LIB}
-    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
-    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
-    )
-
-install(TARGETS ${IR2VEC_LIB} ${IR2VEC_LIB_STATIC}
-    LIBRARY DESTINATION lib
-    PUBLIC_HEADER DESTINATION include
-    RESOURCE DESTINATION ./)
-
-add_subdirectory(test-suite)
-
-add_custom_target(verify-symbolic
- COMMAND bash ./sanity_check.sh SYM llvm17
- COMMENT "Generating Symbolic IR2Vec vectors and comparing with oracle..."
- WORKING_DIRECTORY ./test-suite
- DEPENDS ${PROJECT_NAME}
- VERBATIM
- )
-
-add_custom_target(verify-flowaware
- COMMAND bash sanity_check.sh FA llvm17
- COMMENT "Generating Flow-Aware IR2Vec vectors and comparing with oracle..."
- WORKING_DIRECTORY ./test-suite
- DEPENDS ${PROJECT_NAME}
- VERBATIM
- )
-
-add_custom_target(verify-all DEPENDS verify-symbolic verify-flowaware)
+
+  set(LT_LLVM_INSTALL_DIR "" CACHE PATH "LLVM installation directory")
+  list(APPEND CMAKE_PREFIX_PATH "${LT_LLVM_INSTALL_DIR}/lib/cmake/llvm/")
+
+  find_package(LLVM 17.0.0 REQUIRED CONFIG)
+  message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+  message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
+
+  include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
+  # llvm_map_components_to_libnames(llvm_libs all)
+  llvm_map_components_to_libnames(llvm_libs support core irreader analysis TransformUtils)
+
+  add_executable(${PROJECT_NAME} ${binsrc})
+  target_link_libraries (${PROJECT_NAME} ${llvm_libs} objlib)
+  target_include_directories(${PROJECT_NAME} PRIVATE .)
+
+  add_library(objlib OBJECT ${libsrc})
+  set_property(TARGET objlib PROPERTY POSITION_INDEPENDENT_CODE 1)
+  target_link_libraries (objlib Eigen3::Eigen)
+
+  add_library(${IR2VEC_LIB} SHARED $<TARGET_OBJECTS:objlib>)
+  add_library(${IR2VEC_LIB_STATIC} STATIC $<TARGET_OBJECTS:objlib>)
+  set_target_properties(${IR2VEC_LIB} ${IR2VEC_LIB_STATIC} PROPERTIES
+      VERSION ${PROJECT_VERSION}
+      SOVERSION 1
+      PUBLIC_HEADER "./include/IR2Vec.h"
+      RESOURCE ${RESOURCE_FILES}
+      OUTPUT_NAME ${IR2VEC_LIB}
+      LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+      ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+      )
+
+  install(TARGETS ${IR2VEC_LIB} ${IR2VEC_LIB_STATIC}
+      LIBRARY DESTINATION lib
+      PUBLIC_HEADER DESTINATION include
+      RESOURCE DESTINATION ./)
+
+  add_subdirectory(test-suite)
+
+  add_custom_target(verify-symbolic
+  COMMAND bash ./sanity_check.sh SYM llvm17
+  COMMENT "Generating Symbolic IR2Vec vectors and comparing with oracle..."
+  WORKING_DIRECTORY ./test-suite
+  DEPENDS ${PROJECT_NAME}
+  VERBATIM
+  )
+
+  add_custom_target(verify-flowaware
+  COMMAND bash sanity_check.sh FA llvm17
+  COMMENT "Generating Flow-Aware IR2Vec vectors and comparing with oracle..."
+  WORKING_DIRECTORY ./test-suite
+  DEPENDS ${PROJECT_NAME}
+  VERBATIM
+  )
+
+  add_custom_target(verify-all
+  COMMAND bash sanity_check.sh FA llvm17 && bash sanity_check.sh SYM llvm17
+  COMMENT "Generating both Symbolic and Flow-Aware IR2Vec vectors and comparing with oracle..."
+  WORKING_DIRECTORY ./test-suite
+  DEPENDS ${PROJECT_NAME}
+  VERBATIM
+  )
+
 else()
 
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/include/IR2Vec.h DESTINATION ${LLVM_MAIN_INCLUDE_DIR}/llvm )
+  file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/include/IR2Vec.h DESTINATION ${LLVM_MAIN_INCLUDE_DIR}/llvm )
 
-set(LLVM_OPTIONAL_SOURCES ${binsrc})
+  set(LLVM_OPTIONAL_SOURCES ${binsrc})
 
-add_llvm_library(LLVMIR2Vec
-  ${libsrc}
+  add_llvm_library(LLVMIR2Vec
+    ${libsrc}
 
-  DEPENDS
-  intrinsics_gen
-)
+    DEPENDS
+    intrinsics_gen
+  )
 
-target_link_libraries(LLVMIR2Vec PRIVATE Eigen3::Eigen)
-target_include_directories(LLVMIR2Vec PRIVATE ${LLVM_MAIN_INCLUDE_DIR})
-target_include_directories(LLVMIR2Vec PRIVATE .)
+  target_link_libraries(LLVMIR2Vec PRIVATE Eigen3::Eigen)
+  target_include_directories(LLVMIR2Vec PRIVATE ${LLVM_MAIN_INCLUDE_DIR})
+  target_include_directories(LLVMIR2Vec PRIVATE .)
 
 endif()

src/test-suite/sanity_check.sh.cmake

@@ -1,6 +1,5 @@
 
 BUILD=@LIB_LOC@
-
 EncodingType=$1
 
 SO_FILE=
@@ -26,7 +25,7 @@ fi
 
 SEED_VERSION=$2
 VOCAB_PATH="./vocabulary/seedEmbeddingVocab.txt"
-IR2VEC_PATH="../bin/ir2vec"
+IR2VEC_PATH="../../bin/ir2vec"
 
 functions=("main" "buildMatchingMachine" "search" "BellamFord" "BFS" "isBCUtil" "insertionSort" "binomialCoeff" "find" "countParenth" "boruvkaMST" "maxStackHeight" "badCharHeuristic" "bpm"
     "count" "getMaxUtil" "buildSuffixArray" "countOnes" "countStrings" "countRec" "countWays" "AP" "cutRod" "isCyclic" "isDivisible" "DFS" "editDist" "eggDrop" "isSC" "isConnected" "printClosest"