Add RISC-V JIT backend

pypy/module/micronumpy/test/test_ndarray.py

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+import platform
 import py
 import sys
 
@@ -1879,12 +1880,18 @@ def test_array_view(self):
             assert a.view('S16')[0] == '\x01' + '\x00' * 7 + '\x02'
 
     def test_half_conversions(self):
-        from numpy import array, arange
+        from numpy import array
         from math import isnan, isinf
         e = array([0, -1, -float('inf'), float('nan'), 6], dtype='float16')
         assert map(isnan, e) == [False, False, False, True, False]
         assert map(isinf, e) == [False, False, True, False, False]
         assert e.argmax() == 3
+
+    def test_half_conversions_preserve_nan_payload_float32(self):
+        if platform.machine().startswith('riscv'):
+            py.test.skip('riscv does not preserve nan payload in '
+                         'float64->float32 conversion')
+        from numpy import array, arange
         # numpy preserves value for uint16 -> cast_as_float16 ->
         #     convert_to_float64 -> convert_to_float16 -> uint16
         #  even for float16 various float16 nans
@@ -1896,6 +1903,19 @@ def test_half_conversions(self):
         d = all_f16.view(dtype='uint16')
         assert (c == d).all()
 
+    def test_half_conversions_preserve_nan_payload_float64(self):
+        from numpy import array, arange
+        # numpy preserves value for uint16 -> cast_as_float16 ->
+        #     convert_to_float64 -> convert_to_float16 -> uint16
+        #  even for float16 various float16 nans
+        all_f16 = arange(0xfe00, 0xffff, dtype='uint16')
+        all_f16.dtype = 'float16'
+        all_f64 = array(all_f16, dtype='float64')
+        b = array(all_f64, dtype='float16')
+        c = b.view(dtype='uint16')
+        d = all_f16.view(dtype='uint16')
+        assert (c == d).all()
+
     def test_ndarray_view_empty(self):
         from numpy import array, dtype
         x = array([], dtype=[('a', 'int8'), ('b', 'int8')])

pypy/module/micronumpy/test/test_ufuncs.py

@@ -1,3 +1,6 @@
+import platform
+import py
+
 from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
 from pypy.module.micronumpy.ufuncs import W_UfuncGeneric, unary_ufunc
 from pypy.module.micronumpy.support import _parse_signature
@@ -808,8 +811,19 @@ def test_floorceiltrunc(self):
         assert ([ninf, -2.0, -2.0, -1.0, 0.0, 1.0, 1.0, 0.0, inf] == floor(a)).all()
         assert ([ninf, -1.0, -1.0, -1.0, 0.0, 1.0, 2.0, 1.0, inf] == ceil(a)).all()
         assert ([ninf, -1.0, -1.0, -1.0, 0.0, 1.0, 1.0, 0.0, inf] == trunc(a)).all()
+
+    def test_floorceiltrunc_nan(self):
+        from numpy import floor, ceil, trunc
+        import math
         assert all([math.isnan(f(float("nan"))) for f in floor, ceil, trunc])
         assert all([math.copysign(1, f(abs(float("nan")))) == 1 for f in floor, ceil, trunc])
+
+    def test_floorceiltrunc_nan_negative(self):
+        if platform.machine().startswith('riscv'):
+            py.test.skip('riscv floor/ceil/trunc canonicalizes nan to '
+                         'positive nan')
+        from numpy import floor, ceil, trunc
+        import math
         assert all([math.copysign(1, f(-abs(float("nan")))) == -1 for f in floor, ceil, trunc])
 
     def test_round(self):

pypy/module/pypyjit/test_pypy_c/test_micronumpy.py

@@ -6,6 +6,7 @@
 
 IS_X86 = platform.machine().startswith('x86') or platform.machine() == 'i686'
 IS_S390X = platform.machine() == "s390x"
+IS_RISCV = platform.machine() == 'riscv64'
 
 def no_vector_backend():
     if IS_X86:
@@ -206,18 +207,34 @@ def main():
         assert log.result is True
         assert len(log.loops) == 1
         loop = log._filter(log.loops[0])
-        loop.match("""
-            %(align_check)s
-            guard_not_invalidated(descr=...)
-            f31 = raw_load_f(i9, i29, descr=<ArrayF 8>)
-            i32 = float_ne(f31, 0.000000)
-            guard_true(i32, descr=...)
-            i36 = int_add(i24, 1)
-            i37 = int_add(i29, 8)
-            i38 = int_ge(i36, i30)
-            guard_false(i38, descr=...)
-            jump(..., descr=...)
-            """ % {'align_check': align_check('i29')})
+        if IS_RISCV:
+            # The order of %(align_check)s and guard_not_invalidated(descr=...)
+            # in the RISCV backend is different from other backends.
+            loop.match("""
+                guard_not_invalidated(descr=...)
+                %(align_check)s
+                f31 = raw_load_f(i9, i29, descr=<ArrayF 8>)
+                i32 = float_ne(f31, 0.000000)
+                guard_true(i32, descr=...)
+                i36 = int_add(i24, 1)
+                i37 = int_add(i29, 8)
+                i38 = int_ge(i36, i30)
+                guard_false(i38, descr=...)
+                jump(..., descr=...)
+                """ % {'align_check': align_check('i29')})
+        else:
+            loop.match("""
+                %(align_check)s
+                guard_not_invalidated(descr=...)
+                f31 = raw_load_f(i9, i29, descr=<ArrayF 8>)
+                i32 = float_ne(f31, 0.000000)
+                guard_true(i32, descr=...)
+                i36 = int_add(i24, 1)
+                i37 = int_add(i29, 8)
+                i38 = int_ge(i36, i30)
+                guard_false(i38, descr=...)
+                jump(..., descr=...)
+                """ % {'align_check': align_check('i29')})
         # vector version
         #assert loop.match("""
         #    guard_not_invalidated(descr=...)

rpython/doc/index.rst

@@ -35,6 +35,7 @@ RPython.
    :maxdepth: 1
 
    arm
+   riscv
    logging