Commit 2e153dcb authored by Mccaskey, Alex's avatar Mccaskey, Alex
Browse files

pointing qcor to hfinkel upstream llvm after recent PR 



Signed-off-by: Mccaskey, Alex's avatarAlex McCaskey <mccaskeyaj@ornl.gov>
parent 975c2531

README.md

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ Navigate to ``https://localhost:3000`` in your browser to open the IDE and get s 
Compiler (C++14): GNU 6.1+, Clang 3.4+

CMake 3.9+ (for build)

XACC: see https://xacc.readthedocs.io/en/latest/install.html#building-xacc

LLVM/Clang [Syntax Handler Fork](https://github.com/ornl-qci/llvm-project-csp).

LLVM/Clang [Syntax Handler Fork](https://github.com/hfinkel/llvm-project-csp).

```



## Linux Build Instructions
@@ -48,7 +48,7 @@ need to download the appropriate LLVM/Clang binaries (via `apt-get` for instance 
To build this fork of LLVM/Clang (be aware this step takes up a good amount of RAM):

```bash

$ apt-get install ninja-build [if you dont have ninja]

$ git clone https://github.com/ornl-qci/llvm-project-csp llvm

$ git clone https://github.com/hfinkel/llvm-project-csp llvm

$ cd llvm && mkdir build && cd build

$ cmake -G Ninja ../llvm -DCMAKE_INSTALL_PREFIX=$HOME/.llvm -DBUILD_SHARED_LIBS=TRUE -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_ENABLE_DUMP=ON -DLLVM_ENABLE_PROJECTS=clang

$ cmake --build . --target install

docker/ci/ubuntu1804/base/Dockerfile

+1 −1
Original line number Diff line number Diff line 
from xacc/ubuntu:18.04



run apt-get update && apt-get install -y ninja-build \

    && git clone https://github.com/ornl-qci/llvm-project-csp llvm \

    && git clone https://github.com/hfinkel/llvm-project-csp llvm \

    && cd llvm && mkdir build && cd build \

    && cmake -G Ninja ../llvm -DCMAKE_INSTALL_PREFIX=$HOME/.llvm -DBUILD_SHARED_LIBS=TRUE -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_ENABLE_PROJECTS=clang \

    && cmake --build . --target install \

docker/deploy/base/Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM xacc/deploy-base



run apt-get update && apt-get install -y ninja-build \

    && git clone https://github.com/ornl-qci/llvm-project-csp llvm \

    && git clone https://github.com/hfinkel/llvm-project-csp llvm \

    && cd llvm && mkdir build && cd build \

    && cmake -G Ninja ../llvm -DCMAKE_INSTALL_PREFIX=$HOME/.llvm -DBUILD_SHARED_LIBS=TRUE -DLLVM_ENABLE_DUMP=TRUE -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_ENABLE_PROJECTS=clang \

    && cmake --build . --target install \

handlers/qcor_syntax_handler.cpp

+7 −0
Original line number Diff line number Diff line
@@ -96,6 +96,13 @@ void QCORSyntaxHandler::GetReplacement( 
    return str;

  };



  // Rewrite the original function

  OS << "void " << kernel_name << "(" << program_arg_types[0] << " "  << program_parameters[0];

  for (int i = 1; i < program_arg_types.size(); i++) {

    OS << ", " << program_arg_types[i] << " " << program_parameters[i];

  }

  OS << ") {\n";



  // First re-write, forward declare a function

  // we will implement further down

  OS << "void __internal_call_function_" << kernel_name << "("