Skip to content

Commit

Permalink
Fold llvmlite patches into m-labs/llvmlite repository.
Browse files Browse the repository at this point in the history
whitequark committed Jul 29, 2015
1 parent fd46d8b commit 3378dd5
Showing 11 changed files with 6 additions and 133 deletions.
3 changes: 1 addition & 2 deletions artiq/compiler/testbench/jit.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import os, sys, fileinput, ctypes
from pythonparser import diagnostic
from llvmlite import binding as llvm
from llvmlite_artiq import binding as llvm
from .. import Module

llvm.initialize()
llvm.initialize_native_target()
llvm.initialize_native_asmprinter()
llvm.check_jit_execution()

def main():
libartiq_personality = os.getenv('LIBARTIQ_PERSONALITY')
2 changes: 1 addition & 1 deletion artiq/compiler/testbench/llvmgen.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import sys, fileinput
from pythonparser import diagnostic
from llvmlite import ir as ll
from llvmlite_artiq import ir as ll
from .. import Module

def main():
2 changes: 1 addition & 1 deletion artiq/compiler/transforms/llvm_ir_generator.py
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
into LLVM intermediate representation.
"""

import llvmlite.ir as ll
from pythonparser import ast
from llvmlite_artiq import ir as ll
from .. import types, builtins, ir

class LLVMIRGenerator:
5 changes: 0 additions & 5 deletions conda/llvmlite-or1k/bld.bat
Original file line number Diff line number Diff line change
@@ -4,10 +4,5 @@ set CMAKE_PREFIX_PATH=%LIBRARY_PREFIX%
@rem Ensure there are no build leftovers (CMake can complain)
if exist ffi\build rmdir /S /Q ffi\build

@rem Apply patches
patch -p1 < %RECIPE_DIR%/../../misc/llvmlite-add-all-targets.patch
patch -p1 < %RECIPE_DIR%/../../misc/llvmlite-rename.patch
patch -p1 < %RECIPE_DIR%/../../misc/llvmlite-build-as-debug-on-windows.patch

%PYTHON% -S setup.py install
if errorlevel 1 exit 1
3 changes: 0 additions & 3 deletions conda/llvmlite-or1k/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#!/bin/bash

patch -p1 < ${RECIPE_DIR}/../../misc/llvmlite-add-all-targets.patch
patch -p1 < ${RECIPE_DIR}/../../misc/llvmlite-rename.patch
patch -p1 < ${RECIPE_DIR}/../../misc/llvmlite-build-as-debug-on-windows.patch

This comment has been minimized.

Copy link
@sbourdeauducq

sbourdeauducq Jul 31, 2015

Member

meta.yaml needs updating too, as well as the package name.

PATH=/usr/local/llvm-or1k/bin:$PATH $PYTHON setup.py install
5 changes: 1 addition & 4 deletions doc/manual/installing.rst
Original file line number Diff line number Diff line change
@@ -300,11 +300,8 @@ Installing the host-side software

$ cd ~/artiq-dev
$ git clone https://github.com/m-labs/llvmlite
$ git checkout backport-3.5
$ git checkout artiq
$ cd llvmlite
$ patch -p1 < ~/artiq-dev/artiq/misc/llvmlite-add-all-targets.patch
$ patch -p1 < ~/artiq-dev/artiq/misc/llvmlite-rename.patch
$ patch -p1 < ~/artiq-dev/artiq/misc/llvmlite-build-as-debug-on-windows.patch
$ LLVM_CONFIG=/usr/local/llvm-or1k/bin/llvm-config python3 setup.py install --user

* Install ARTIQ: ::
38 changes: 0 additions & 38 deletions misc/llvmlite-add-all-targets.patch

This file was deleted.

13 changes: 0 additions & 13 deletions misc/llvmlite-build-as-debug-on-windows.patch

This file was deleted.

65 changes: 0 additions & 65 deletions misc/llvmlite-rename.patch

This file was deleted.

3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -20,7 +20,8 @@ def run(self):
requirements = [
"sphinx", "sphinx-argparse", "pyserial", "numpy", "scipy",
"python-dateutil", "prettytable", "h5py", "pydaqmx", "pyelftools",
"quamash", "pyqtgraph", "pythonparser", "lit", "OutputCheck"
"quamash", "pyqtgraph", "pythonparser",
"llvmlite_artiq", "lit", "OutputCheck"
]

scripts = [
Empty file removed t.py
Empty file.

0 comments on commit 3378dd5

Please sign in to comment.