Fix -m 200 multihash and benchmark

pull/330/head
jsteube 8 years ago
parent 518fcb387a
commit c7b67376a8

@ -135,7 +135,9 @@ __kernel void m00200_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
a &= 0x7fffffff;
b &= 0x7fffffff;
COMPARE_M_SIMD (a, b, c, d);
u32x z = 0;
COMPARE_M_SIMD (a, b, z, z);
}
}
@ -185,8 +187,8 @@ __kernel void m00200_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
{
digests_buf[digests_offset].digest_buf[DGST_R0],
digests_buf[digests_offset].digest_buf[DGST_R1],
digests_buf[digests_offset].digest_buf[DGST_R2],
digests_buf[digests_offset].digest_buf[DGST_R3]
0,
0
};
/**
@ -271,7 +273,9 @@ __kernel void m00200_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
a &= 0x7fffffff;
b &= 0x7fffffff;
COMPARE_S_SIMD (a, b, c, d);
u32x z = 0;
COMPARE_S_SIMD (a, b, z, z);
}
}

@ -149,8 +149,6 @@ __kernel void m00200_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
u32x a = MYSQL323_A;
u32x b = MYSQL323_B;
u32x c = 0;
u32x d = 0;
u32x add = 7;
@ -197,7 +195,9 @@ __kernel void m00200_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
a &= 0x7fffffff;
b &= 0x7fffffff;
COMPARE_M_SIMD (a, b, c, d);
u32x z = 0;
COMPARE_M_SIMD (a, b, z, z);
}
}
@ -247,8 +247,8 @@ __kernel void m00200_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
{
digests_buf[digests_offset].digest_buf[DGST_R0],
digests_buf[digests_offset].digest_buf[DGST_R1],
digests_buf[digests_offset].digest_buf[DGST_R2],
digests_buf[digests_offset].digest_buf[DGST_R3]
0,
0
};
/**
@ -397,7 +397,9 @@ __kernel void m00200_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
a &= 0x7fffffff;
b &= 0x7fffffff;
COMPARE_S_SIMD (a, b, c, d);
u32x z = 0;
COMPARE_S_SIMD (a, b, z, z);
}
}

@ -37,8 +37,6 @@
\
u32x a = MYSQL323_A; \
u32x b = MYSQL323_B; \
u32x c = 0; \
u32x d = 0; \
\
u32x add = 7; \
@ -82,7 +80,9 @@
a &= 0x7fffffff; \
b &= 0x7fffffff; \
\
COMPARE_M_SIMD (a, b, c, d); \
u32x z = 0; \
\
COMPARE_M_SIMD (a, b, z, z); \
} \
}
@ -91,7 +91,9 @@
a &= 0x7fffffff; \
b &= 0x7fffffff; \
\
COMPARE_S_SIMD (a, b, c, d); \
u32x z = 0; \
\
COMPARE_S_SIMD (a, b, z, z); \
} \
}
@ -104,18 +106,6 @@ void m00200m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_r
const u32 gid = get_global_id (0);
const u32 lid = get_local_id (0);
/**
* digest
*/
const u32 search[4] =
{
digests_buf[digests_offset].digest_buf[DGST_R0],
digests_buf[digests_offset].digest_buf[DGST_R1],
digests_buf[digests_offset].digest_buf[DGST_R2],
digests_buf[digests_offset].digest_buf[DGST_R3]
};
/**
* loop
*/
@ -270,8 +260,8 @@ void m00200s (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_r
{
digests_buf[digests_offset].digest_buf[DGST_R0],
digests_buf[digests_offset].digest_buf[DGST_R1],
digests_buf[digests_offset].digest_buf[DGST_R2],
digests_buf[digests_offset].digest_buf[DGST_R3]
0,
0
};
/**

@ -25,7 +25,7 @@ NEVER_CRACK="11600"
SLOW_ALGOS="400 500 501 1600 1800 2100 2500 3200 5200 5800 6211 6221 6231 6241 6251 6261 6271 6281 6300 6400 6500 6600 6700 6800 7100 7200 7400 7900 8200 8800 8900 9000 9100 9200 9300 9400 9500 9600 10000 10300 10500 10700 10900 11300 11600 11900 12000 12100 12200 12300 12400 12500 12800 12900 13000 13200 13400"
OPTS="--quiet --force --potfile-disable --runtime 200 --gpu-temp-disable --weak-hash-threshold=0 -u 1024 -n 128"
OPTS="--quiet --force --potfile-disable --runtime 200 --gpu-temp-disable --weak-hash-threshold=0 -u 1024 -d 1"
OUTD="test_$(date +%s)"

Loading…
Cancel
Save