w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-23 04:38:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replacing floating point with integer in exhaustive search decreased exec. time from 33s to 23s.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6946 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2016-07-24 21:30:46 +00:00
parent 99d4ed1399
commit 418f8b4ca6
2 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
lib/detectmsk32.f90
View File

@ -23,15 +23,17 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol,t00)
complex bb(6) complex bb(6)
integer s8(8),s8r(8),hardbits(32) integer s8(8),s8r(8),hardbits(32)
integer, dimension(1) :: iloc integer, dimension(1) :: iloc
integer icd(0:4095)
integer ihammd(0:4096-1) integer ihammd(0:4096-1)
integer indices(MAXSTEPS) integer indices(MAXSTEPS)
integer ipeaks(10) integer ipeaks(10)
integer ig24(0:4096-1) integer ig24(0:4096-1)
integer ig(0:23,0:4095)
integer isoftbits(32)
integer likelymessages(0:31) integer likelymessages(0:31)
logical qsocontext logical qsocontext
logical ismask(NFFT) logical ismask(NFFT)
real cbi(42),cbq(42) real cbi(42),cbq(42)
real cd(0:4095)
real detmet(-2:MAXSTEPS+3) real detmet(-2:MAXSTEPS+3)
real detfer(MAXSTEPS) real detfer(MAXSTEPS)
real rcw(12) real rcw(12)
@ -94,6 +96,14 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol,t00)
call golay24_table(ig24) call golay24_table(ig24)
do i=0,4095
ncw=ig24(i)
do j=0,23
ib=iand(1,ishft(ncw,-j))
ig(j,i)=2*ib-1
enddo
enddo
first=.false. first=.false.
endif endif
@ -103,9 +113,9 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol,t00)
call fmtmsg(hashmsg,iz) call fmtmsg(hashmsg,iz)
call hash(hashmsg,22,ihash) call hash(hashmsg,22,ihash)
ihash=iand(ihash,127) ihash=iand(ihash,127)
ig=32*ihash + irpt igl=32*ihash + irpt
likelymessages(irpt)=ig likelymessages(irpt)=igl
! write(*,*) irpt,hashmsg,ig,ig24(ig) ! write(*,*) irpt,hashmsg,igl,ig24(igl)
enddo enddo
qsocontext=.false. qsocontext=.false.
@ -198,7 +208,7 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol,t00)
imsgbest=-1 imsgbest=-1
nbadsyncbest=99 nbadsyncbest=99
nhammdbest=99 nhammdbest=99
cdbest=1e32 icdbest=1e6
cdratbest=0.0 cdratbest=0.0
do ip=1,ndet !run through the candidates and try to sync/demod/decode do ip=1,ndet !run through the candidates and try to sync/demod/decode
@ -349,54 +359,56 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol,t00)
s2av=sum(softbits*softbits)/32 s2av=sum(softbits*softbits)/32
ssig=sqrt(s2av-sav*sav) ssig=sqrt(s2av-sav*sav)
softbits=softbits/ssig softbits=softbits/ssig
isoftbits=softbits*1e4
call timer('search32',0) call timer('search32',0)
if( qsocontext ) then ! search only 32 likely messages. if( qsocontext ) then ! search only 32 likely messages.
cd=1e6 icd=1e6
ihammd=99 ihammd=99
do i=0,31 do i=0,31
ncw=ig24(likelymessages(i)) ncw=ig24(likelymessages(i))
cd(i)=0.0 icd(i)=0.0
ihammd(i)=0 ihammd(i)=0
do ii=1,24 do ii=1,24
ib=iand(1,ishft(ncw,1-ii)) ib=iand(1,ishft(ncw,1-ii))
ib=2*ib-1 ib=2*ib-1
if( ib*softbits(ii+8) .lt. 0 ) then if( ib*softbits(ii+8) .lt. 0 ) then
cd(i)=cd(i)+abs(softbits(ii+8)) icd(i)=cd(i)+abs(softbits(ii+8))
ihammd(i)=ihammd(i)+1 ihammd(i)=ihammd(i)+1
endif endif
enddo enddo
enddo enddo
else ! exhaustive decoder, look at every codeword. else ! exhaustive decoder, look at every codeword.
cd=1e6 icd=1e6
ihammd=99 ihammd=99
do i=0,4096-1 do i=0,4096-1
ncw=ig24(i) ! ncw=ig24(i)
cd(i)=0.0 icd(i)=0.0
ihammd(i)=0 ihammd(i)=0
do ii=1,24 do ii=1,24
ib=iand(1,ishft(ncw,1-ii)) ! ib=iand(1,ishft(ncw,1-ii))
ib=2*ib-1 ib=ig(ii-1,i)
if( ib*softbits(ii+8) .lt. 0 ) then ! ib=2*ib-1
cd(i)=cd(i)+abs(softbits(ii+8)) if( ib*isoftbits(ii+8) .lt. 0 ) then
icd(i)=icd(i)+abs(isoftbits(ii+8))
ihammd(i)=ihammd(i)+1 ihammd(i)=ihammd(i)+1
endif endif
enddo enddo
enddo enddo
endif endif
call timer('search32',1) call timer('search32',1)
cdm=minval(cd) icdm=minval(icd)
iloc=minloc(cd) iloc=minloc(icd)
imsg=iloc(1)-1 imsg=iloc(1)-1
cd(imsg)=1e6 icd(imsg)=1e6
cdm2=minval(cd) icdm2=minval(icd)
iloc=minloc(cd) iloc=minloc(icd)
imsg2=iloc(1)-1 imsg2=iloc(1)-1
cdrat=cdm2/(cdm+0.001) cdrat=icdm2/(icdm+1)
cdrat2=cdm/(cdm2+0.0001) cdrat2=icdm/(icdm2+1)
if( (cdm .lt. cdbest) .or. ((cdm .eq. cdbest) .and. (ihammd(imsg) .lt. nhammdbest)) ) then if( (icdm .lt. icdbest) .or. ((icdm .eq. icdbest) .and. (ihammd(imsg) .lt. nhammdbest)) ) then
cdratbest = cdrat cdratbest = cdrat
cdrat2best = cdrat2 cdrat2best = cdrat2
cdbest = cdm icdbest = icdm
imsgbest = imsg imsgbest = imsg
imsg2best = imsg2 imsg2best = imsg2
iavbest = iav iavbest = iav
@ -407,7 +419,7 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol,t00)
iphabest = ipha iphabest = ipha
nbadsyncbest = nbadsync nbadsyncbest = nbadsync
nhammdbest = ihammd(imsg) nhammdbest = ihammd(imsg)
if( ( nhammdbest .eq. 0 ) .and. (cdbest .eq. 0.0) .and. (cdratbest .gt. 2000.0) ) goto 999 if( ( nhammdbest .eq. 0 ) .and. (icdbest .eq. 0.0) .and. (cdratbest .gt. 2000.0) ) goto 999
endif endif
enddo ! phase loop enddo ! phase loop
enddo ! frame averaging loop enddo ! frame averaging loop
@ -418,7 +430,7 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol,t00)
999 continue 999 continue
msgreceived=' ' msgreceived=' '
if( imsgbest .gt. 0 ) then if( imsgbest .gt. 0 ) then
if( ( nhammdbest+nbadsyncbest .le. 4 ) .and. cdratbest .gt. 10.0 ) then if( ( nhammdbest+nbadsyncbest .le. 4 ) .and. cdratbest .gt. 5.0 ) then
if( qsocontext ) then if( qsocontext ) then
nrxrpt=iand(likelymessages(imsgbest),31) nrxrpt=iand(likelymessages(imsgbest),31)
nrxhash=(likelymessages(imsgbest)-nrxrpt)/32 nrxhash=(likelymessages(imsgbest)-nrxrpt)/32
@ -445,14 +457,15 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol,t00)
endif endif
if(nrxhash.ne.ihash .and. t00.gt.0.0 .and. nsnr.gt.-4) then if(nrxhash.ne.ihash .and. t00.gt.0.0 .and. nsnr.gt.-4) then
nmessages=1 nmessages=1
write(msgreceived,'(a5,1x,a4)') "<...>",rpt(nrxrpt) ! write(msgreceived,'(a5,1x,a4)') "<...>",rpt(nrxrpt)
write(msgreceived,'(a1,i3,1x,i3,a1,a4)') "<",nrxhash,ihash,">",rpt(nrxrpt)
write(lines(nmessages),1020) nutc,nsnr,t0,nint(fest),msgreceived write(lines(nmessages),1020) nutc,nsnr,t0,nint(fest),msgreceived
endif endif
! write(*,1022) nutc,ipbest,times(ipbest),snrs(ipbest),fest,nrxrpt,nrxhash, & ! write(*,1022) nutc,ipbest,times(ipbest),snrs(ipbest),fest,nrxrpt,nrxhash, &
! rpt(nrxrpt),imessage,ig24(imessage),nhammdbest, & ! rpt(nrxrpt),imessage,ig24(imessage),nhammdbest, &
! cdbest,cdratbest,cdrat2best,nbadsyncbest,ipkbest,idbest,idfbest,iavbest,iphabest ! icdbest,cdratbest,cdrat2best,nbadsyncbest,ipkbest,idbest,idfbest,iavbest,iphabest
!1022 format(i4.4,2x,i4,f8.3,f8.2,f8.2,i6,i6,a6,i8,i10,i4,f8.3,f8.2,f8.2,i5,i5,i5,i5,i5,i5) !1022 format(i6.6,2x,i4,f8.3,f8.2,f8.2,i6,i6,a6,i8,i10,i4,i8,f10.2,f10.2,i5,i5,i5,i5,i5,i5)
endif endif
endif endif
endif endif

2
lib/genmsk32.f90
View File

@ -47,7 +47,7 @@ subroutine genmsk32(msg,msgsent,ichk,itone,itype)
ncodeword=ig24(ig) ncodeword=ig24(ig)
!write(*,*) 'codeword is: ',ncodeword,'message is: ',ig,'report index: ',irpt,'hash: ',ihash write(*,*) 'codeword is: ',ncodeword,'message is: ',ig,'report index: ',irpt,'hash: ',ihash
do i=1,24 do i=1,24
codeword(i)=iand(1,ishft(ncodeword,1-i)) codeword(i)=iand(1,ishft(ncodeword,1-i))