Fix patch level

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
Remove obsolete patch
2020-05-04 11:39:50 +03:00 · 2020-05-04 11:00:46 +03:00 · 2020-05-04 10:59:26 +03:00 · 2020-05-04 08:28:35 +03:00 · 2020-05-04 08:16:07 +03:00 · 2018-06-04 17:16:40 +02:00
3 changed files with 4694 additions and 1 deletions
--- a/openblas-0.3.0-disable-tests.patch
+++ b/openblas-0.3.0-disable-tests.patch
@ -0,0 +1,13 @@
+diff --git a/OpenBLAS-0.3.0/Makefile b/OpenBLAS-0.3.0/Makefile
+index 679bc8d..a8e26b3 100644
+--- a/OpenBLAS-0.3.0/Makefile
+++ b/OpenBLAS-0.3.0/Makefile
+@@ -28,7 +28,7 @@ SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench
+ .PHONY : all libs netlib $(RELA) test ctest shared install
+ .NOTPARALLEL : all libs $(RELA) prof lapack-test install blas-test
+ 
+-all :: libs netlib $(RELA) tests shared
+all :: libs netlib $(RELA) shared
+ 	@echo
+ 	@echo " OpenBLAS build complete. ($(LIB_COMPONENTS))"
+ 	@echo
--- a/openblas.spec
+++ b/openblas.spec
@ -15,7 +15,7 @@

 Name:           openblas
 Version:        0.3.9
-Release:        2%{?dist}
+Release:        2.0.riscv64%{?dist}
 Summary:        An optimized BLAS library based on GotoBLAS2
 License:        BSD
 URL:            https://github.com/xianyi/OpenBLAS/
@ -32,6 +32,11 @@ Patch3:         openblas-0.3.7-tests.patch
 # Fix C++ compatibility (BZ #1820131)
 Patch4:         https://github.com/xianyi/OpenBLAS/commit/ee2e758278b5d82b7242f505ea694f082ef65879.patch

+# RISC-V 64-bit support (generated from risc-v upstream branch)
+Patch10:        riscv64.patch
+# Disable tests on RISC-V
+Patch11:        openblas-0.3.0-disable-tests.patch
+
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  gcc-gfortran
@ -46,8 +51,12 @@ BuildRequires:  multilib-rpm-config
 %global execstack 1
 %endif
 %else
+%ifarch riscv64
+%global execstack 0
+%else
 %global execstack 1
 %endif
+%endif
 %if %{execstack}
 BuildRequires:  /usr/bin/execstack
 %endif
@ -246,6 +255,11 @@ cd OpenBLAS-%{version}
 %patch3 -p1 -b .tests
 %patch4 -p1 -b .cplusplus

+%ifarch riscv64
+%patch10 -p1 -b .riscv64
+%patch11 -p2 -b .disable-tests
+%endif
+
 # Fix source permissions
 find -name \*.f -exec chmod 644 {} \;

@ -386,6 +400,9 @@ TARGET="TARGET=ARMV8 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1"
 %ifarch s390x
 TARGET="TARGET=ZARCH_GENERIC DYNAMIC_ARCH=1 DYNAMIC_OLDER=1"
 %endif
+%ifarch riscv64
+TARGET="TARGET=RISCV64_GENERIC DYNAMIC_ARCH=0"
+%endif

 %if 0%{?rhel} == 5
 # Gfortran too old to recognize -frecursive
@ -450,6 +467,9 @@ suffix=""
 %ifarch armv7hl
 suffix="_armv7"
 %endif
+%ifarch riscv64
+suffix="_riscv64_generic"
+%endif
 slibname=`basename %{buildroot}%{_libdir}/libopenblas${suffix}-*.so .so`
 mv %{buildroot}%{_libdir}/${slibname}.a %{buildroot}%{_libdir}/lib%{name}.a
 if [[ "$suffix" != "" ]]; then
@ -668,6 +688,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
 %endif

 %changelog
+* Mon May 04 2020 David Abdurachmanov <david.abdurachmanvo@sifive.com> - 0.3.9-2.0.riscv64
+- Enable RISC-V 64-bit (riscv64) support
+
 * Thu Apr 02 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.9-2
 - Patch for BZ #1820131.

--- a/riscv64.patch
+++ b/riscv64.patch
Author	SHA1	Message	Date
David Abdurachmanov	1f55ab7064	Fix patch level Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-05-04 11:39:50 +03:00
David Abdurachmanov	a4f15c2fb7	Remove obsolete patch Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-05-04 11:00:46 +03:00
David Abdurachmanov	51f4fdc3fc	Disable tests on RISC-V (riscv64) [..] TEST 1/27 amax:samax [OK] TEST 2/27 ismax:negative_step_2 [OK] TEST 3/27 ismax:positive_step_2 [OK] TEST 4/27 ismin:negative_step_2 [FAIL] ERR: test_ismin.c:62 expected 9, got 1 TEST 5/27 ismin:positive_step_2 [FAIL] ERR: test_ismin.c:49 expected 9, got 50 TEST 6/27 drotmg:drotmg_D1_big_D2_big_flag_zero [OK] TEST 7/27 drotmg:rotmg_D1eqD2_X1eqX2 [OK] TEST 8/27 drotmg:rotmg_issue1452 [OK] TEST 9/27 drotmg:rotmg [OK] TEST 10/27 axpy:caxpy_inc_0 [OK] TEST 11/27 axpy:saxpy_inc_0 [OK] TEST 12/27 axpy:zaxpy_inc_0 [OK] TEST 13/27 axpy:daxpy_inc_0 [OK] TEST 14/27 zdotu:zdotu_offset_1 [OK] TEST 15/27 zdotu:zdotu_n_1 [OK] TEST 16/27 dsdot:dsdot_n_1 [FAIL] ERR: test_dsdot.c:47 expected -2.393e-03, got -2.393e-03 (diff -1.035e-10, tol 1.000e-13) TEST 17/27 swap:cswap_inc_0 [OK] TEST 18/27 swap:sswap_inc_0 [OK] TEST 19/27 swap:zswap_inc_0 [OK] TEST 20/27 swap:dswap_inc_0 [OK] TEST 21/27 rot:csrot_inc_0 [OK] TEST 22/27 rot:srot_inc_0 [OK] TEST 23/27 rot:zdrot_inc_0 [OK] TEST 24/27 rot:drot_inc_0 [OK] TEST 25/27 potrf:smoketest_trivial [OK] TEST 26/27 potrf:bug_695 [OK] TEST 27/27 kernel_regress:skx_avx [OK] RESULTS: 27 tests (24 ok, 3 failed, 0 skipped) ran in 1799 ms make[1]: *** [Makefile:45: run_test] Error 3 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-05-04 10:59:26 +03:00
David Abdurachmanov	5f85e9d9dc	Add the latest RISC-V development Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-05-04 08:28:35 +03:00
David Abdurachmanov	4d546acf92	Merge remote-tracking branch 'up/master' into master-riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-05-04 08:16:07 +03:00
David Abdurachmanov	d6da2377d6	Disable execstack for riscv64 BUILDSTDERR: execstack: "/builddir/build/BUILDROOT/openblas-0.3.0-1.1.riscv64.fc29.riscv64/usr/lib64/libopenblas-r0.3.0.dev.so"'s architecture is not supported Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-06-04 17:16:40 +02:00
David Abdurachmanov	79be0c377b	Disable running of all tests on RISC-V Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-06-04 08:30:21 +02:00
David Abdurachmanov	0c4b2cc81f	Remove ARCH=riscv64 Remove as we end up with: riscv64 -ru ../../libRblas_riscv64-r0.3.0.dev.a sbdsvdx.o spotrf2.o .. BUILDSTDERR: make[2]: riscv64: Command not found This happens in lapack-netlib/SRC/Makefile:556 Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-06-03 23:19:56 +02:00
David Abdurachmanov	7a6b8e0347	Add ARCH=riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-06-03 20:11:09 +02:00
David Abdurachmanov	2757a8b851	Add TARGET=RISCV64 for riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-06-03 20:01:17 +02:00
David Abdurachmanov	7af5bb9a21	Add support for RISC-V (riscv64) Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-06-03 15:45:23 +02:00