GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-13 17:17:29 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1163 resolves issue with airspy unpacked calibrations hanging. Updates each test to check elapsed timer on a more granular scale on the theory that the SIMD vector implementation is horribly slow on some systems. (#1164)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2022-03-12 08:33:55 -05:00
committed by GitHub
parent a9f4fbbdd4
commit 968ea458da
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/io/github/dsheirer/vector/calibrate/airspy/AirspyUnpackedCalibration.java
View File

@@ -57,6 +57,8 @@ public class AirspyUnpackedCalibration extends Calibration
short[] residualI = getShortSamples(AirspyBufferIterator.I_OVERLAP); short[] residualI = getShortSamples(AirspyBufferIterator.I_OVERLAP);
short[] residualQ = getShortSamples(AirspyBufferIterator.Q_OVERLAP); short[] residualQ = getShortSamples(AirspyBufferIterator.Q_OVERLAP);
mLog.info("AIRSPY UNPACKED - VECTOR SIMD LANES PREFERRED: " + FloatVector.SPECIES_PREFERRED.length());
//Warm-Up Phase .... //Warm-Up Phase ....
Mean scalarMean = new Mean(); Mean scalarMean = new Mean();
@@ -214,7 +216,7 @@ public class AirspyUnpackedCalibration extends Calibration
AirspyBufferIteratorScalar iterator = new AirspyBufferIteratorScalar(samples, residualI, AirspyBufferIteratorScalar iterator = new AirspyBufferIteratorScalar(samples, residualI,
residualQ, 0.0f, System.currentTimeMillis()); residualQ, 0.0f, System.currentTimeMillis());
while(iterator.hasNext()) while(iterator.hasNext() && ((System.currentTimeMillis() - start) < ITERATION_DURATION_MS))
{ {
accumulator += iterator.next().i()[2]; accumulator += iterator.next().i()[2];
count++; count++;
@@ -235,7 +237,7 @@ public class AirspyUnpackedCalibration extends Calibration
AirspyBufferIteratorVector64Bits iterator = new AirspyBufferIteratorVector64Bits(samples, residualI, AirspyBufferIteratorVector64Bits iterator = new AirspyBufferIteratorVector64Bits(samples, residualI,
residualQ, 0.0f, System.currentTimeMillis()); residualQ, 0.0f, System.currentTimeMillis());
while(iterator.hasNext()) while(iterator.hasNext() && ((System.currentTimeMillis() - start) < ITERATION_DURATION_MS))
{ {
accumulator += iterator.next().i()[2]; accumulator += iterator.next().i()[2];
count++; count++;
@@ -255,7 +257,7 @@ public class AirspyUnpackedCalibration extends Calibration
AirspyBufferIteratorVector128Bits iterator = new AirspyBufferIteratorVector128Bits(samples, residualI, AirspyBufferIteratorVector128Bits iterator = new AirspyBufferIteratorVector128Bits(samples, residualI,
residualQ, 0.0f, System.currentTimeMillis()); residualQ, 0.0f, System.currentTimeMillis());
while(iterator.hasNext()) while(iterator.hasNext() && ((System.currentTimeMillis() - start) < ITERATION_DURATION_MS))
{ {
accumulator += iterator.next().i()[2]; accumulator += iterator.next().i()[2];
count++; count++;
@@ -276,7 +278,7 @@ public class AirspyUnpackedCalibration extends Calibration
AirspyBufferIteratorVector256Bits iterator = AirspyBufferIteratorVector256Bits iterator =
new AirspyBufferIteratorVector256Bits(samples, residualI, residualQ, 0.0f, System.currentTimeMillis()); new AirspyBufferIteratorVector256Bits(samples, residualI, residualQ, 0.0f, System.currentTimeMillis());
while(iterator.hasNext()) while(iterator.hasNext() && ((System.currentTimeMillis() - start) < ITERATION_DURATION_MS))
{ {
accumulator += iterator.next().i()[2]; accumulator += iterator.next().i()[2];
count++; count++;
@@ -297,7 +299,7 @@ public class AirspyUnpackedCalibration extends Calibration
AirspyBufferIteratorVector512Bits iterator = AirspyBufferIteratorVector512Bits iterator =
new AirspyBufferIteratorVector512Bits(samples, residualI, residualQ, 0.0f, System.currentTimeMillis()); new AirspyBufferIteratorVector512Bits(samples, residualI, residualQ, 0.0f, System.currentTimeMillis());
while(iterator.hasNext()) while(iterator.hasNext() && ((System.currentTimeMillis() - start) < ITERATION_DURATION_MS))
{ {
accumulator += iterator.next().i()[2]; accumulator += iterator.next().i()[2];
count++; count++;

12
src/main/java/io/github/dsheirer/vector/calibrate/airspy/AirspyUnpackedInterleavedCalibration.java
View File

@@ -58,6 +58,8 @@ public class AirspyUnpackedInterleavedCalibration extends Calibration
short[] residualQ = getShortSamples(AirspyBufferIterator.Q_OVERLAP); short[] residualQ = getShortSamples(AirspyBufferIterator.Q_OVERLAP);
//Warm-Up Phase .... //Warm-Up Phase ....
mLog.info("AIRSPY UNPACKED INTERLEAVED - VECTOR SIMD LANES PREFERRED: " + FloatVector.SPECIES_PREFERRED.length());
Mean scalarMean = new Mean(); Mean scalarMean = new Mean();
for(int x = 0; x < WARMUP_ITERATIONS; x++) for(int x = 0; x < WARMUP_ITERATIONS; x++)
@@ -225,7 +227,7 @@ public class AirspyUnpackedInterleavedCalibration extends Calibration
AirspyInterleavedBufferIteratorScalar iterator = new AirspyInterleavedBufferIteratorScalar(samples, residualI, AirspyInterleavedBufferIteratorScalar iterator = new AirspyInterleavedBufferIteratorScalar(samples, residualI,
residualQ, 0.0f, System.currentTimeMillis()); residualQ, 0.0f, System.currentTimeMillis());
while(iterator.hasNext()) while(iterator.hasNext() && ((System.currentTimeMillis() - start) < ITERATION_DURATION_MS))
{ {
accumulator += iterator.next().samples()[2]; accumulator += iterator.next().samples()[2];
count++; count++;
@@ -246,7 +248,7 @@ public class AirspyUnpackedInterleavedCalibration extends Calibration
AirspyInterleavedBufferIteratorVector64Bits iterator = new AirspyInterleavedBufferIteratorVector64Bits(samples, residualI, AirspyInterleavedBufferIteratorVector64Bits iterator = new AirspyInterleavedBufferIteratorVector64Bits(samples, residualI,
residualQ, 0.0f, System.currentTimeMillis()); residualQ, 0.0f, System.currentTimeMillis());
while(iterator.hasNext()) while(iterator.hasNext() && ((System.currentTimeMillis() - start) < ITERATION_DURATION_MS))
{ {
accumulator += iterator.next().samples()[2]; accumulator += iterator.next().samples()[2];
count++; count++;
@@ -267,7 +269,7 @@ public class AirspyUnpackedInterleavedCalibration extends Calibration
AirspyInterleavedBufferIteratorVector128Bits iterator = new AirspyInterleavedBufferIteratorVector128Bits(samples, residualI, AirspyInterleavedBufferIteratorVector128Bits iterator = new AirspyInterleavedBufferIteratorVector128Bits(samples, residualI,
residualQ, 0.0f, System.currentTimeMillis()); residualQ, 0.0f, System.currentTimeMillis());
while(iterator.hasNext()) while(iterator.hasNext() && ((System.currentTimeMillis() - start) < ITERATION_DURATION_MS))
{ {
accumulator += iterator.next().samples()[2]; accumulator += iterator.next().samples()[2];
count++; count++;
@@ -288,7 +290,7 @@ public class AirspyUnpackedInterleavedCalibration extends Calibration
AirspyInterleavedBufferIteratorVector256Bits iterator = AirspyInterleavedBufferIteratorVector256Bits iterator =
new AirspyInterleavedBufferIteratorVector256Bits(samples, residualI, residualQ, 0.0f, System.currentTimeMillis()); new AirspyInterleavedBufferIteratorVector256Bits(samples, residualI, residualQ, 0.0f, System.currentTimeMillis());
while(iterator.hasNext()) while(iterator.hasNext() && ((System.currentTimeMillis() - start) < ITERATION_DURATION_MS))
{ {
accumulator += iterator.next().samples()[2]; accumulator += iterator.next().samples()[2];
count++; count++;
@@ -309,7 +311,7 @@ public class AirspyUnpackedInterleavedCalibration extends Calibration
AirspyInterleavedBufferIteratorVector512Bits iterator = AirspyInterleavedBufferIteratorVector512Bits iterator =
new AirspyInterleavedBufferIteratorVector512Bits(samples, residualI, residualQ, 0.0f, System.currentTimeMillis()); new AirspyInterleavedBufferIteratorVector512Bits(samples, residualI, residualQ, 0.0f, System.currentTimeMillis());
while(iterator.hasNext()) while(iterator.hasNext() && ((System.currentTimeMillis() - start) < ITERATION_DURATION_MS))
{ {
accumulator += iterator.next().samples()[2]; accumulator += iterator.next().samples()[2];
count++; count++;