AIWC

.github/workflows/install-deps.sh

@@ -18,15 +18,21 @@ if [ "`uname`" == "Linux" ]; then
     sudo update-alternatives --install \
         /usr/bin/clang++ clang++ /usr/bin/clang++-${LLVM_VERSION} 20
 
+    if [ "$LLVM_VERSION" -ge 14 ] ; then \
+      sudo apt-get install -y libbsd-dev && \
+      apt download libpolly-${LLVM_VERSION}-dev && \
+      sudo dpkg --auto-deconfigure --force-all -i libpolly-${LLVM_VERSION}-dev*.deb ; \
+    fi
+
     # Other dependencies
     sudo apt-get install -y libedit-dev libvulkan-dev
 elif [ "`uname`" == "Darwin" ]; then
     URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}.0.0"
     ARCHIVE="clang+llvm-${LLVM_VERSION}.0.0-x86_64-apple-darwin.tar.xz"
 
-    if [ ${LLVM_VERSION} -lt 13 ]; then
-        ln -sfn /Applications/Xcode_12.4.app /Applications/Xcode.app
-    fi
+    #hopefully temporary dirty hack to resolve bad pathing: No rule to make target `/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk/usr/lib/libcurses.tbd', needed by `liboclgrind.dylib'
+    ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk
+    ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk
 
     mkdir -p llvm-${LLVM_VERSION}
     wget "$URL/$ARCHIVE"

.gitignore

@@ -9,6 +9,7 @@ config.h
 .ninja_log
 build.ninja
 rules.ninja
+build
 
 # Compiler output
 *.o
@@ -26,7 +27,9 @@ tests/runtime/map_buffer
 # Misc
 oclgrind-*.tar.gz
 oclgrind-*.zip
+clang+llvm-*.tar.xz
 .clang_complete
 .DS_Store
 *.kdev4
 *.sublime-*
+llvm-*

CMakeLists.txt

@@ -6,7 +6,9 @@
 # license terms please see the LICENSE file distributed with this
 # source code.
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.3)
+cmake_policy(SET CMP0057 NEW)
+
 project(Oclgrind)
 set(Oclgrind_VERSION_MAJOR 21)
 set(Oclgrind_VERSION_MINOR 10)
@@ -27,6 +29,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Enable rpath on OS X
 set(CMAKE_MACOSX_RPATH 1)
+# Fix rpath on unix systems
+if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+endif()
 
 # Enable WIP 3.0 support.
 option(ENABLE_EXPERIMENTAL_OPENCL_3, "Enable experimental OpenCL 3.0 support.")
@@ -55,6 +61,9 @@ endif()
 # Detect endianness
 test_big_endian(IS_BIG_ENDIAN)
 
+if (LLVM_ROOT_DIR)
+  set(LLVM_DIR "${LLVM_ROOT_DIR}/lib/cmake/llvm")
+endif()
 
 # Find LLVM
 find_package(LLVM REQUIRED CONFIG NO_CMAKE_BUILDS_PATH)
@@ -248,10 +257,10 @@ add_library(oclgrind ${CORE_LIB_TYPE}
   src/plugins/RaceDetector.h
   src/plugins/RaceDetector.cpp
   src/plugins/Uninitialized.h
-  src/plugins/Uninitialized.cpp)
-target_link_libraries(oclgrind
-  PRIVATE ${CORE_EXTRA_LIBS} ${CLANG_LIBS}
-  PUBLIC ${LLVM_LIBS})
+  src/plugins/Uninitialized.cpp
+  src/plugins/WorkloadCharacterisation.h
+  src/plugins/WorkloadCharacterisation.cpp)
+target_link_libraries(oclgrind PUBLIC ${CORE_EXTRA_LIBS} ${CLANG_LIBS} ${LLVM_LIBS})
 
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
   target_link_libraries(oclgrind PRIVATE Version)

Dockerfile

@@ -0,0 +1,50 @@
+FROM ubuntu:xenial
+
+#ENV https_proxy http://proxy.ftpn.ornl.gov:3128
+#ENV http_proxy http://proxy.ftpn.ornl.gov:3128
+
+RUN apt-get -yq update
+
+# Utilities
+RUN apt-get install -yq --allow-downgrades --allow-remove-essential            \
+    --allow-change-held-packages git wget vim python-pip apt-utils cmake unzip                \
+    libboost-all-dev software-properties-common python-software-properties libcompute-dev libreadline-dev autoconf
+
+# Install LLVM-11.0.1 and clang---needed for AIWC
+WORKDIR /
+RUN wget -qO- "https://cmake.org/files/v3.12/cmake-3.12.1-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr
+RUN wget https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/llvm-11.0.1.src.tar.xz
+RUN tar -xvf llvm-11.0.1.src.tar.xz
+RUN wget https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/clang-11.0.1.src.tar.xz
+RUN tar -xvf clang-11.0.1.src.tar.xz && mv clang-11.0.1.src clang
+#build a shared library version
+WORKDIR /llvm-11.0.1.src/build
+RUN cmake -DLLVM_ENABLE_PROJECTS=clang -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_ASM_COMPILER=gcc -DBUILD_SHARED_LIBS=On -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/llvm-11.0.1 ..
+RUN make -j8 install
+RUN make -j8 clang install
+
+# Architecture-Independent Workload Characterization (AIWC)
+RUN mkdir /oclgrind
+WORKDIR /oclgrind
+RUN git clone https://github.com/BeauJoh/AIWC.git src
+RUN mkdir /oclgrind/build
+WORKDIR /oclgrind/build
+ENV CC /llvm-11.0.1/bin/clang
+ENV CXX /llvm-11.0.1/bin/clang++
+RUN cmake /oclgrind/src -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLLVM_DIR=/llvm-11.0.1/lib/cmake/llvm -DCLANG_ROOT=/llvm-11.0.1 -DCMAKE_INSTALL_PREFIX=/oclgrind -DBUILD_SHARED_LIBS=On
+RUN make
+RUN make install
+RUN mkdir -p /etc/OpenCL/vendors && echo /oclgrind/lib/liboclgrind-rt-icd.so > /etc/OpenCL/vendors/oclgrind.icd
+
+# Install Extended Open Dwarfs Benchmark suite to test OpenCL and AIWC...
+WORKDIR /ExtendedOpenDwarfs
+RUN git clone https://github.com/BeauJoh/OpenDwarfs.git src
+WORKDIR /ExtendedOpenDwarfs/src
+RUN ./autogen.sh
+WORKDIR /ExtendedOpenDwarfs/build
+RUN ../src/configure
+RUN make lud && cp ../src/dense-linear-algebra/lud/lud_kernel.cl .
+
+#and run a test with an OpenCL version of LUD to generate AIWC features.
+CMD OCLGRIND_WORKLOAD_CHARACTERISATION=1 OCLGRIND_WORKLOAD_CHARACTERISATION_OUTPUT_PATH=~/aiwc_metrics.csv ./lud -s 16
+

README.md

@@ -144,6 +144,12 @@ GitHub Wiki:
   https://github.com/jrprice/Oclgrind/wiki/
 
 
+Architecture-Independent Workload Characterization (AIWC)
+---------------------------------------------------------
+
+AIWC is supported as a plugin in Oclgrind!
+Read [here](./AIWC.md) to find out more about it.
+
 Contact
 -------
 If you encounter any issues or have any questions, please use the

config.h.in

@@ -5,3 +5,5 @@
 #define LLVM_VERSION @LLVM_VERSION@
 
 #define IS_BIG_ENDIAN @IS_BIG_ENDIAN@
+
+#define INSTALLED_LIBRARY_DIR "${INSTALLED_LIBRARY_DIR}"

install.sh

@@ -0,0 +1,24 @@
+INSTALL_DIR="~/.oclgrind"
+OS="linux-gnu-ubuntu-20.04"
+#OS="apple-darwin"
+
+LLVM_VERSION=13
+
+#install llvm
+URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}.0.0"
+ARCHIVE="clang+llvm-${LLVM_VERSION}.0.0-x86_64-${OS}.tar.xz"
+mkdir -p llvm-${LLVM_VERSION}
+wget "$URL/$ARCHIVE"
+tar xf "$ARCHIVE" --strip-components 1 -C llvm-${LLVM_VERSION}
+
+#install Oclgrind
+PROJ_DIR=`pwd`
+mkdir -p build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo\
+         -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
+         -DLLVM_ROOT_DIR="${PROJ_DIR}/llvm-${LLVM_VERSION}"
+make install
+
+#clean up
+cd .. && rm -r ${ARCHIVE} llvm-${LLVM_VERSION}