1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
$NetBSD: patch-test_utils.f,v 1.1 2021/05/29 09:55:14 thor Exp $
Fix the fortran code for modern compilers who do not like to silently
treat complex arrays as real arrays of twice the size and increase the
error threshold for tests a bit, as the zch1dn test in tch1dn is quite
at the edge.
--- test/utils.f.orig 2021-05-29 07:46:09.748438877 +0000
+++ test/utils.f
@@ -58,18 +58,48 @@ c
end do
end subroutine
+c In the old days, you would have treated the complex array as twice as
+c much of a real array, but modern compilers do not like that. So
+c resort to a buffer and explicit conversion. This is not
+c performance-relevant code, anyway.
+c Incidentally, this change in random numbers (strides of real and
+c imaginary parts) subtly reduces error in tch1dn to make it pass again.
+c Further hint that the error margin had to be just be a bit widenend.
+
subroutine crandg(m,n,x,ldx)
integer m,n,ldx
complex x(ldx,*)
+ real buf(128,2)
+ integer j,k,b,i
external srandg
- call srandg(2*m,n,x,2*ldx)
+ do j=1,n
+ do k=1,m,128
+ b=min(m-k+1,128)
+ call srandg(b,1,buf(1,1),b)
+ call srandg(b,1,buf(1,2),b)
+ do i=1,b
+ x(k+i-1,j) = cmplx(buf(i,1), buf(i,2))
+ end do
+ end do
+ end do
end subroutine
subroutine zrandg(m,n,x,ldx)
integer m,n,ldx
double complex x(ldx,*)
+ double precision buf(128,2)
+ integer j,k,b,i
external srandg
- call drandg(2*m,n,x,2*ldx)
+ do j=1,n
+ do k=1,m,128
+ b=min(m-k+1,128)
+ call drandg(b,1,buf(1,1),b)
+ call drandg(b,1,buf(1,2),b)
+ do i=1,b
+ x(k+i-1,j) = cmplx(buf(i,1), buf(i,2))
+ end do
+ end do
+ end do
end subroutine
block data xrandi
@@ -218,12 +248,16 @@ c
1002 format (1x,F6.3,SP,F6.3,'i',$)
end subroutine
+c 200*?lamch('p') is a bit tight, some tests are at the fringe, being pushed
+c over by details of the random number generation. Trying 250 as error
+c limit factor.
+
character*4 function spftol(rnrm)
real rnrm,slamch
external slamch
common /stats/ passed,failed
integer passed,failed
- if (rnrm < 2e2*slamch('p')) then
+ if (rnrm < 2.5e2*slamch('p')) then
spftol = 'PASS'
passed = passed + 1
else
@@ -237,7 +271,7 @@ c
external dlamch
common /stats/ passed,failed
integer passed,failed
- if (rnrm < 2d2*dlamch('p')) then
+ if (rnrm < 2.5d2*dlamch('p')) then
dpftol = 'PASS'
passed = passed + 1
else
|
