From 93df2e2ec3c22e55907174a34ebf36ef8cf958d8 Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@fau.de>
Date: Sat, 1 Sep 2018 19:26:29 +0200
Subject: [PATCH] Readme and Install

---
 INSTALL.md | 36 ++++++++----------------------------
 README.md  | 14 +++-----------
 2 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 30dd779..50eaa4b 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,39 +1,19 @@
 # Installation
 Binary packages can be found [here](../../releases).
 ### On Ubuntu
-Download the Debian package and run `sudo dpkg -i hipacc_<version>_amd64.deb`.
-### On Windows
-Download and run the installer `Hipacc-<version>-win64.exe`.
+Download the Debian package and run `sudo dpkg -i hipacc-fpga_<version>_amd64.deb`.
 
 
 # Run Samples
 ### On Ubuntu
 Open a terminal and run:
 ```bash
-cp -r /usr/local/hipacc/samples .
+cp -r /usr/local/hipacc-fpga/samples .
 cd samples/1_Local_Operators/Box_Blur
 # Compile and run
 make
-# Compile and run for CUDA
-make cuda
-```
-### On Windows
-###### With Visual Studio 2015 and 2017
-Navigate to sample directory `%HIPACC_PATH%\samples\1_Local_Operators\Box_Blur`,
-open the project `sample.vcxproj`, and run build.
-
-###### With Visual C++ Build Tools 2015
-To run the samples without Visual Studio, install the latest **Windows SDK** and
-**VC++ 2015 toolset** provided by
-[Build Tools for Visual Studio 2017](https://aka.ms/buildtools).
-Open PowerShell and run:
-```PowerShell
-cp -r "$Env:HIPACC_PATH\samples" .
-cd .\samples\1_Local_Operators\Box_Blur
-# Compile and run
-.\make.bat
-# Compile and run for CUDA
-.\make.bat cuda
+# Compile and run for Vivado HLS
+make vivado
 ```
 
 
@@ -51,7 +31,7 @@ directory `<SRC>`:
 cd <SRC>
 
 # Get Hipacc
-git clone https://github.com/hipacc/hipacc.git
+git clone https://github.com/hipacc/hipacc-fpga.git
 
 # Get libc++
 git clone --branch <rev> http://llvm.org/git/libcxx.git
@@ -65,7 +45,7 @@ git clone --branch <rev> http://llvm.org/git/clang.git
 
 # Apply patches if present
 cd <SRC>/llvm/tools/clang
-git apply <SRC>/hipacc/patches/clang-<rev>.patch
+git apply <SRC>/hipacc-fpga/patches/clang-<rev>.patch
 ```
 
 ### Compile the Sources
@@ -117,7 +97,7 @@ make install
 export PATH=<DST>/bin:$PATH
 
 # Compile Hipacc
-mkdir <SRC>/hipacc/build && cd <SRC>/hipacc/build
+mkdir <SRC>/hipacc-fpga/build && cd <SRC>/hipacc-fpga/build
 cmake .. -DCMAKE_INSTALL_PREFIX=<DST>
 make install
 ```
@@ -141,7 +121,7 @@ cmake.exe .. -G "Visual Studio 14 2015 Win64" -T "LLVM-vs2014" -DCMAKE_INSTALL_P
 cmake.exe --build . --target INSTALL
 
 # Compile Hipacc
-mkdir <SRC>\hipacc\build; cd <SRC>\hipacc\build
+mkdir <SRC>\hipacc-fpga\build; cd <SRC>\hipacc-fpga\build
 cmake.exe .. -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX="<DST>"
 cmake.exe --build . --target INSTALL
 ```
diff --git a/README.md b/README.md
index 26c4095..75fa31f 100644
--- a/README.md
+++ b/README.md
@@ -8,15 +8,7 @@ As back ends, the framework supports C/C++, CUDA, OpenCL, and Renderscript.
 # Install
 See [Hipacc documentation](http://hipacc-lang.org/install.html) and [Install notes](INSTALL.md) for detailed information.
 
-# Run Vivado HLS
+# Run Samples
 
-Make sure that the binary `vivado_hls` can be found in your `PATH` and run the
-following commands in order to build provided test cases:
-
-```bash
-cd $(CMAKE_INSTALL_PREFIX)/tests/fpga
-make vivado TEST_CASE=tests/laplace_rgba
-make vivado TEST_CASE=tests/harris_corner
-make vivado TEST_CASE=tests/optical_flow
-make vivado TEST_CASE=tests/block_matching
-```
+Make sure that the binary `vivado_hls` can be found in your `PATH` and follow
+the instructions [here](INSTALL.md#run-samples).