Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d095d481ffea
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 60a4a7c6e996
Choose a head ref
  • 5 commits
  • 3 files changed
  • 1 contributor

Commits on Apr 5, 2016

  1. llvm_ir_generator: fix DICompileUnit.language.

    whitequark committed Apr 5, 2016
    Copy the full SHA
    72b952e View commit details

  2. llvm_ir_generator: change !{→unconditionally_}dereferenceable. 

    Since LLVM 3.8, !dereferenceable is weaker, so we introduce
!unconditionally_dereferenceable (http://reviews.llvm.org/D18738)
to regain its functionality.
    whitequark committed Apr 5, 2016
    Copy the full SHA
    ad83b09 View commit details

  3. llvm_ir_generator: add fast-math flags to fcmp. 

    This is allowed in 3.8.
    whitequark committed Apr 5, 2016
    Copy the full SHA
    8b1c5e3 View commit details

  4. conda: update llvmlite-artiq dependency. 

    Build 24 includes addc optimizations.
    whitequark committed Apr 5, 2016
    Copy the full SHA
    e908a5f View commit details

  5. test_pulse_rate_dds: adjust bounds.

    whitequark committed Apr 5, 2016
    Copy the full SHA
    60a4a7c View commit details
Showing with 9 additions and 13 deletions.
  1. +6 −10 artiq/compiler/transforms/llvm_ir_generator.py
  2. +2 −2 artiq/test/coredevice/test_rtio.py
  3. +1 −1 conda/artiq/meta.yaml
16 changes: 6 additions & 10 deletions artiq/compiler/transforms/llvm_ir_generator.py
View file
Original file line number Diff line number Diff line change
@@ -22,12 +22,6 @@
llmetadata = ll.MetaData()


DW_LANG_Python = 0x0014
DW_TAG_compile_unit = 17
DW_TAG_subroutine_type = 21
DW_TAG_file_type = 41
DW_TAG_subprogram = 46

def memoize(generator):
def memoized(self, *args):
key = (generator,) + args
@@ -74,7 +68,7 @@ def emit_file(self, source_buffer):
@memoize
def emit_compile_unit(self, source_buffer, llsubprograms):
return self.emit_debug_info("DICompileUnit", {
"language": ll.DIToken("DW_LANG_C99"),
"language": ll.DIToken("DW_LANG_Python"),
"file": self.emit_file(source_buffer),
"producer": "ARTIQ",
"runtimeVersion": 0,
@@ -660,7 +654,7 @@ def mark_dereferenceable(self, load):
assert isinstance(load, ll.LoadInstr) and isinstance(load.type, ll.PointerType)
pointee_size = load.type.pointee.get_abi_size(self.lldatalayout, context=self.llcontext)
metadata = self.llmodule.add_metadata([ll.Constant(lli64, pointee_size)])
load.set_metadata('dereferenceable', metadata)
load.set_metadata('unconditionally_dereferenceable', metadata)

def process_GetLocal(self, insn):
env = insn.environment()
@@ -986,8 +980,10 @@ def process_Compare(self, insn):
return self.llbuilder.icmp_unsigned(op, lllhs, llrhs,
name=insn.name)
elif isinstance(lllhs.type, ll.DoubleType):
return self.llbuilder.fcmp_ordered(op, lllhs, llrhs,
name=insn.name)
llresult = self.llbuilder.fcmp_ordered(op, lllhs, llrhs,
name=insn.name)
self.add_fast_math_flags(llresult)
return llresult
elif isinstance(lllhs.type, ll.LiteralStructType):
# Compare aggregates (such as lists or ranges) element-by-element.
llvalue = ll.Constant(lli1, True)
4 changes: 2 additions & 2 deletions artiq/test/coredevice/test_rtio.py
View file
Original file line number Diff line number Diff line change
@@ -263,8 +263,8 @@ def test_pulse_rate_dds(self):
self.execute(PulseRateDDS)
rate = self.dataset_mgr.get("pulse_rate")
print(rate)
self.assertGreater(rate, 100*us)
self.assertLess(rate, 150*us)
self.assertGreater(rate, 5*us)
self.assertLess(rate, 25*us)

def test_loopback_count(self):
npulses = 2
2 changes: 1 addition & 1 deletion conda/artiq/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ requirements:
- binutils-or1k-linux
run:
- python >=3.5.1
- llvmlite-artiq 0.10.0.dev py35_22
- llvmlite-artiq 0.10.0.dev py35_24
- scipy
- numpy
- prettytable