Commit f553c50b7beb13a52adc0f6e5741bd10bca95014
2012-12-22T01:22:42
ztex: if we had only errors in one round we do not count the errors to detect a totally non working fpga we only do that if the last round had some valid nonces. if we would count the errors the automatic megahertz adaption would drop and never recover.
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
diff --git a/driver-ztex.c b/driver-ztex.c
index de7011f..41ee3b0 100644
--- a/driver-ztex.c
+++ b/driver-ztex.c
@@ -223,6 +223,8 @@ static int64_t ztex_scanhash(struct thr_info *thr, struct work *work,
overflow = false;
int count = 0;
+ int validNonces = 0;
+ double errorCount = 0;
applog(LOG_DEBUG, "%s: entering poll loop", ztex->repr);
while (!(overflow || thr->work_restart)) {
@@ -274,10 +276,13 @@ static int64_t ztex_scanhash(struct thr_info *thr, struct work *work,
// do not count errors in the first 500ms after sendHashData (2x250 wait time)
if (count > 2) {
- ztex->errorCount[ztex->freqM] += 1.0 / ztex->numNonces;
thr->cgpu->hw_errors++;
+ errorCount += (1.0 / ztex->numNonces);
}
}
+ else
+ validNonces++;
+
for (j=0; j<=ztex->extraSolutions; j++) {
nonce = hdata[i].goldenNonce[j];
@@ -313,6 +318,18 @@ static int64_t ztex_scanhash(struct thr_info *thr, struct work *work,
}
}
+ // only add the errorCount if we had at least some valid nonces or
+ // had no valid nonces in the last round
+ if (ztex->nonceCheckValid > 0 && validNonces == 0) {
+ applog(LOG_ERR, "%s: resetting %.1f errors", ztex->repr, errorCount);
+ }
+ else {
+ ztex->errorCount[ztex->freqM] += errorCount;
+ }
+
+ // remember the number of valid nonces for the check in the next round
+ ztex->nonceCheckValid = validNonces;
+
ztex->errorRate[ztex->freqM] = ztex->errorCount[ztex->freqM] / ztex->errorWeight[ztex->freqM] * (ztex->errorWeight[ztex->freqM] < 100? ztex->errorWeight[ztex->freqM] * 0.01: 1.0);
if (ztex->errorRate[ztex->freqM] > ztex->maxErrorRate[ztex->freqM])
ztex->maxErrorRate[ztex->freqM] = ztex->errorRate[ztex->freqM];
diff --git a/libztex.c b/libztex.c
index d33c5c5..b3dfbeb 100644
--- a/libztex.c
+++ b/libztex.c
@@ -701,6 +701,9 @@ int libztex_prepare_device(struct libusb_device *dev, struct libztex_device** zt
newdev->maxErrorRate[cnt] = 0;
}
+ // fake that the last round found something valid
+ newdev->nonceCheckValid = 1;
+
newdev->usbbus = libusb_get_bus_number(dev);
newdev->usbaddress = libusb_get_device_address(dev);
sprintf(newdev->repr, "ZTEX %s-1", newdev->snString);
diff --git a/libztex.h b/libztex.h
index ffd056e..c1d09b6 100644
--- a/libztex.h
+++ b/libztex.h
@@ -73,6 +73,8 @@ struct libztex_device {
double errorRate[256];
double maxErrorRate[256];
+ int16_t nonceCheckValid;
+
int16_t numberOfFpgas;
int selectedFpga;
bool parallelConfigSupport;