Skip to content

Commit 3378dd5

Browse files
author
whitequark
committedJul 29, 2015
Fold llvmlite patches into m-labs/llvmlite repository.
·
8.01.0rc1
1 parent fd46d8b commit 3378dd5

File tree

11 files changed

+6
-133
lines changed

11 files changed

+6
-133
lines changed
 

Diff for: ‎artiq/compiler/testbench/jit.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import os, sys, fileinput, ctypes
22
from pythonparser import diagnostic
3-
from llvmlite import binding as llvm
3+
from llvmlite_artiq import binding as llvm
44
from .. import Module
55

66
llvm.initialize()
77
llvm.initialize_native_target()
88
llvm.initialize_native_asmprinter()
9-
llvm.check_jit_execution()
109

1110
def main():
1211
libartiq_personality = os.getenv('LIBARTIQ_PERSONALITY')

Diff for: ‎artiq/compiler/testbench/llvmgen.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import sys, fileinput
22
from pythonparser import diagnostic
3-
from llvmlite import ir as ll
3+
from llvmlite_artiq import ir as ll
44
from .. import Module
55

66
def main():

Diff for: ‎artiq/compiler/transforms/llvm_ir_generator.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
into LLVM intermediate representation.
44
"""
55

6-
import llvmlite.ir as ll
76
from pythonparser import ast
7+
from llvmlite_artiq import ir as ll
88
from .. import types, builtins, ir
99

1010
class LLVMIRGenerator:

Diff for: ‎conda/llvmlite-or1k/bld.bat

-5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,5 @@ set CMAKE_PREFIX_PATH=%LIBRARY_PREFIX%
44
@rem Ensure there are no build leftovers (CMake can complain)
55
if exist ffi\build rmdir /S /Q ffi\build
66

7-
@rem Apply patches
8-
patch -p1 < %RECIPE_DIR%/../../misc/llvmlite-add-all-targets.patch
9-
patch -p1 < %RECIPE_DIR%/../../misc/llvmlite-rename.patch
10-
patch -p1 < %RECIPE_DIR%/../../misc/llvmlite-build-as-debug-on-windows.patch
11-
127
%PYTHON% -S setup.py install
138
if errorlevel 1 exit 1

Diff for: ‎conda/llvmlite-or1k/build.sh

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
#!/bin/bash
22

3-
patch -p1 < ${RECIPE_DIR}/../../misc/llvmlite-add-all-targets.patch
4-
patch -p1 < ${RECIPE_DIR}/../../misc/llvmlite-rename.patch
5-
patch -p1 < ${RECIPE_DIR}/../../misc/llvmlite-build-as-debug-on-windows.patch
Has a conversation. Original line has a conversation.
63
PATH=/usr/local/llvm-or1k/bin:$PATH $PYTHON setup.py install

Diff for: ‎doc/manual/installing.rst

+1-4
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,8 @@ Installing the host-side software
300300

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

310307
* Install ARTIQ: ::

Diff for: ‎misc/llvmlite-add-all-targets.patch

-38
This file was deleted.

Diff for: ‎misc/llvmlite-build-as-debug-on-windows.patch

-13
This file was deleted.

Diff for: ‎misc/llvmlite-rename.patch

-65
This file was deleted.

Diff for: ‎setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ def run(self):
2020
requirements = [
2121
"sphinx", "sphinx-argparse", "pyserial", "numpy", "scipy",
2222
"python-dateutil", "prettytable", "h5py", "pydaqmx", "pyelftools",
23-
"quamash", "pyqtgraph", "pythonparser", "lit", "OutputCheck"
23+
"quamash", "pyqtgraph", "pythonparser",
24+
"llvmlite_artiq", "lit", "OutputCheck"
2425
]
2526

2627
scripts = [

Diff for: ‎t.py

Whitespace-only changes.

0 commit comments

Comments
 (0)
Please sign in to comment.