Merge pull request #1 from heathdutton/tmp

New Compilation

Mode.cpp

@@ -75,6 +75,13 @@ Mode Mode::leading(const char charLeading) {
  return r;
 }
 
+Mode Mode::gas() {
+ Mode r;
+ r.name = "gas";
+ r.kernel = "profanity_score_gas";
+ return r;
+}
+
 Mode Mode::range(const cl_uchar min, const cl_uchar max) {
  Mode r;
  r.name = "range";

Mode.hpp

@@ -28,6 +28,7 @@ class Mode {
 
  static Mode benchmark();
  static Mode zeros();
+ static Mode gas();
  static Mode letters();
  static Mode numbers();
  static Mode doubles();

README.md

@@ -16,6 +16,7 @@ usage: ./profanity [OPTIONS]
  Basic modes:
  --benchmark Run without any scoring, a benchmark.
  --zeros Score on zeros anywhere in hash.
+ --gas Score on number of zero bytes.
  --letters Score on letters anywhere in hash.
  --numbers Score on numbers anywhere in hash.
  --mirror Score on mirroring from center.

help.hpp

@@ -9,6 +9,7 @@ usage: ./profanity [OPTIONS]
  Basic modes:
  --benchmark Run without any scoring, a benchmark.
  --zeros Score on zeros anywhere in hash.
+ --gas Score on number of zero bytes.
  --letters Score on letters anywhere in hash.
  --numbers Score on numbers anywhere in hash.
  --mirror Score on mirroring from center.

profanity.cl

@@ -748,6 +748,21 @@ __kernel void profanity_score_leading(__global mp_number * const pInverse, __glo
  profanity_result_update(id, hash, pResult, score, scoreMax);
 }
 
+__kernel void profanity_score_gas(__global mp_number * const pInverse, __global result * const pResult, __constant const uchar * const data1, __constant const uchar * const data2, const uchar scoreMax) {
+ const size_t id = get_global_id(0);
+ __global const uchar * const hash = pInverse[id].d;
+ int score = 0;
+
+ if (pInverse[id].d[0] == 0) {
+ score = 4;
+ for (int i = 4; i < 20; ++i) {
+ score += (hash[i] == 0);
+ }
+ }
+
+ profanity_result_update(id, hash, pResult, score, scoreMax);
+}
+
 __kernel void profanity_score_range(__global mp_number * const pInverse, __global result * const pResult, __constant const uchar * const data1, __constant const uchar * const data2, const uchar scoreMax) {
  const size_t id = get_global_id(0);
  __global const uchar * const hash = pInverse[id].d;

profanity.cpp

@@ -146,6 +146,7 @@ int main(int argc, char * * argv) {
  bool bHelp = false;
  bool bModeBenchmark = false;
  bool bModeZeros = false;
+ bool bModeGas = false;
  bool bModeLetters = false;
  bool bModeNumbers = false;
  std::string strModeLeading;
@@ -184,6 +185,7 @@ int main(int argc, char * * argv) {
  argp.addSwitch('i', "inverse-size", inverseSize);
  argp.addSwitch('I', "inverse-multiple", inverseMultiple);
  argp.addSwitch('c', "contract", bMineContract);
+ argp.addSwitch('g', "gas", bModeGas);
 
  if (!argp.parse()) {
  std::cout << "error: bad arguments, try again :<" << std::endl;
@@ -200,6 +202,8 @@ int main(int argc, char * * argv) {
  mode = Mode::benchmark();
  } else if (bModeZeros) {
  mode = Mode::zeros();
+ } else if (bModeGas) {
+ mode = Mode::gas();
  } else if (bModeLetters) {
  mode = Mode::letters();
  } else if (bModeNumbers) {