Skip to content

Commit af07302

Browse files
cbuchner1cbuchner1
committed
v1.0 - Yo, I heard y'all like X11
1 parent e2bfb4b commit af07302

16 files changed

+3845
-11
lines changed

‎Makefile.am‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,24 @@ ccminer_SOURCES = elist.h miner.h compat.h \
3333
quark/cuda_jh512.cu quark/cuda_quark_blake512.cu quark/cuda_quark_groestl512.cu quark/cuda_skein512.cu \
3434
quark/cuda_bmw512.cu quark/cuda_quark_keccak512.cu quark/quarkcoin.cu quark/animecoin.cu \
3535
quark/cuda_quark_compactionTest.cu \
36-
cuda_nist5.cu
36+
cuda_nist5.cu \
37+
sph/cubehash.c sph/echo.c sph/luffa.c sph/shavite.c sph/simd.c \
38+
x11/x11.cu x11/cuda_x11_luffa512.cu x11/cuda_x11_cubehash512.cu \
39+
x11/cuda_x11_shavite512.cu x11/cuda_x11_simd512.cu x11/cuda_x11_echo.cu \
3740

3841
ccminer_LDFLAGS = $(PTHREAD_FLAGS) @CUDA_LDFLAGS@
3942
ccminer_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@ @CUDA_LIBS@ @OPENMP_CFLAGS@ @LIBS@
4043
ccminer_CPPFLAGS = -msse2 @LIBCURL_CPPFLAGS@ @OPENMP_CFLAGS@ $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) -DSCRYPT_KECCAK512 -DSCRYPT_CHACHA -DSCRYPT_CHOOSE_COMPILETIME
4144

4245
# we're now targeting all major compute architectures within one binary.
4346
.cu.o:
44-
$(NVCC) @CFLAGS@ -I . -Xptxas "-abi=no -v" -gencode=arch=compute_20,code=\"sm_20,compute_20\" -gencode=arch=compute_30,code=\"sm_30,compute_30\" -gencode=arch=compute_35,code=\"sm_35,compute_35\" --maxrregcount=80 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<
47+
$(NVCC) @CFLAGS@ -I . -Xptxas "-abi=no -v" -gencode=arch=compute_30,code=\"sm_30,compute_30\" -gencode=arch=compute_35,code=\"sm_35,compute_35\" --maxrregcount=80 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<
48+
49+
# Shavite compiles faster with 128 regs
50+
x11/cuda_x11_shavite512.o: x11/cuda_x11_shavite512.cu
51+
$(NVCC) -I . -I cudpp-2.1/include @CFLAGS@ -Xptxas "-abi=no -v" -gencode=arch=compute_30,code=\"sm_30,compute_30\" -gencode=arch=compute_35,code=\"sm_35,compute_35\" --maxrregcount=128 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<
4552

4653
# ABI requiring code modules
47-
# this module doesn't compile with Compute 2.0 unfortunately
4854
quark/cuda_quark_compactionTest.o: quark/cuda_quark_compactionTest.cu
4955
$(NVCC) -I . -I cudpp-2.1/include @CFLAGS@ -Xptxas "-abi=yes -v" -gencode=arch=compute_30,code=\"sm_30,compute_30\" -gencode=arch=compute_35,code=\"sm_35,compute_35\" --maxrregcount=80 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<
5056

‎README.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
ccMiner release 0.9 (May 06th 2014) - "Say Hi to Quark, Anime"
2+
ccMiner release 1.0 (May 10th 2014) - "Did anyone say X11?"
33
-------------------------------------------------------------
44

55
***************************************************************
@@ -59,6 +59,8 @@ its command line interface and options.
5959
jackpot use to mine Jackpotcoin
6060
quark use to mine Quarkcoin
6161
anime use to mine Animecoin
62+
nist5 use to mine TalkCoin
63+
x11 use to mine DarkCoin
6264

6365
-d, --devices gives a comma separated list of CUDA device IDs
6466
to operate on. Device IDs start counting from 0!
@@ -138,6 +140,9 @@ features.
138140

139141
>>> RELEASE HISTORY <<<
140142

143+
May 10th 2014 added X11, but without the bells & whistles
144+
(no killer Groestl, SIMD hash quite slow still)
145+
141146
May 6th 2014 this adds the quark and animecoin algorithms.
142147

143148
May 3rd 2014 add the MjollnirCoin hash algorithm for the upcomin

‎ccminer.vcxproj‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,53 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
431431
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
432432
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
433433
</CudaCompile>
434+
<CudaCompile Include="x11\cuda_x11_aes.cu">
435+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
436+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
437+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
438+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
439+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
440+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
441+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
442+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
443+
</CudaCompile>
444+
<CudaCompile Include="x11\cuda_x11_cubehash512.cu">
445+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
446+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
447+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
448+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
449+
</CudaCompile>
450+
<CudaCompile Include="x11\cuda_x11_echo.cu">
451+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
452+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
453+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
454+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
455+
</CudaCompile>
456+
<CudaCompile Include="x11\cuda_x11_luffa512.cu">
457+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
458+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
459+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
460+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
461+
</CudaCompile>
462+
<CudaCompile Include="x11\cuda_x11_shavite512.cu">
463+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
464+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
465+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
466+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
467+
<MaxRegCount Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">128</MaxRegCount>
468+
</CudaCompile>
469+
<CudaCompile Include="x11\cuda_x11_simd512.cu">
470+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
471+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
472+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
473+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
474+
</CudaCompile>
475+
<CudaCompile Include="x11\x11.cu">
476+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
477+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
478+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
479+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-Xptxas "-abi=no -v" %(AdditionalOptions)</AdditionalOptions>
480+
</CudaCompile>
434481
</ItemGroup>
435482
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
436483
<ImportGroup Label="ExtensionTargets">

‎ccminer.vcxproj.filters‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@
5252
<Filter Include="Header Files\CUDA\heavy">
5353
<UniqueIdentifier>{3281db48-f394-49ea-a1ef-6ebd09828d50}</UniqueIdentifier>
5454
</Filter>
55+
<Filter Include="Source Files\CUDA\x11">
56+
<UniqueIdentifier>{dd751f2d-bfd6-42c1-8f9b-cbe94e539353}</UniqueIdentifier>
57+
</Filter>
5558
</ItemGroup>
5659
<ItemGroup>
5760
<ClCompile Include="compat\jansson\dump.c">
@@ -313,5 +316,26 @@
313316
<CudaCompile Include="cuda_nist5.cu">
314317
<Filter>Source Files\CUDA</Filter>
315318
</CudaCompile>
319+
<CudaCompile Include="x11\cuda_x11_aes.cu">
320+
<Filter>Source Files\CUDA\x11</Filter>
321+
</CudaCompile>
322+
<CudaCompile Include="x11\cuda_x11_cubehash512.cu">
323+
<Filter>Source Files\CUDA\x11</Filter>
324+
</CudaCompile>
325+
<CudaCompile Include="x11\cuda_x11_echo.cu">
326+
<Filter>Source Files\CUDA\x11</Filter>
327+
</CudaCompile>
328+
<CudaCompile Include="x11\cuda_x11_luffa512.cu">
329+
<Filter>Source Files\CUDA\x11</Filter>
330+
</CudaCompile>
331+
<CudaCompile Include="x11\cuda_x11_shavite512.cu">
332+
<Filter>Source Files\CUDA\x11</Filter>
333+
</CudaCompile>
334+
<CudaCompile Include="x11\cuda_x11_simd512.cu">
335+
<Filter>Source Files\CUDA\x11</Filter>
336+
</CudaCompile>
337+
<CudaCompile Include="x11\x11.cu">
338+
<Filter>Source Files\CUDA\x11</Filter>
339+
</CudaCompile>
316340
</ItemGroup>
317341
</Project>

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([ccminer], [2014.05.06])
1+
AC_INIT([ccminer], [2014.05.10])
22

33
AC_PREREQ([2.59c])
44
AC_CANONICAL_SYSTEM

‎cpu-miner.c‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ typedef enum {
129129
ALGO_JACKPOT,
130130
ALGO_QUARK,
131131
ALGO_ANIME,
132-
ALGO_NIST5
132+
ALGO_NIST5,
133+
ALGO_X11
133134
} sha256_algos;
134135

135136
static const char *algo_names[] = {
@@ -141,7 +142,8 @@ static const char *algo_names[] = {
141142
"jackpot",
142143
"quark",
143144
"anime",
144-
"nist5"
145+
"nist5",
146+
"x11"
145147
};
146148

147149
bool opt_debug = false;
@@ -212,6 +214,7 @@ Options:\n\
212214
quark Quark hash\n\
213215
anime Animecoin hash\n\
214216
nist5 NIST5 (TalkCoin) hash\n\
217+
x11 X11 (DarkCoin) hash\n\
215218
-d, --devices takes a comma separated list of CUDA devices to use.\n\
216219
Device IDs start counting from 0! Alternatively takes\n\
217220
string names of your cards like gtx780ti or gt640#2\n\
@@ -901,6 +904,11 @@ static void *miner_thread(void *userdata)
901904
max_nonce, &hashes_done);
902905
break;
903906

907+
case ALGO_X11:
908+
rc = scanhash_x11(thr_id, work.data, work.target,
909+
max_nonce, &hashes_done);
910+
break;
911+
904912
default:
905913
/* should never happen */
906914
goto out;
@@ -1453,7 +1461,7 @@ static void signal_handler(int sig)
14531461
}
14541462
#endif
14551463

1456-
#define PROGRAM_VERSION "0.9"
1464+
#define PROGRAM_VERSION "1.0"
14571465
int main(int argc, char *argv[])
14581466
{
14591467
struct thr_info *thr;

‎cpuminer-config.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
#define PACKAGE_NAME "ccminer"
153153

154154
/* Define to the full name and version of this package. */
155-
#define PACKAGE_STRING "ccminer 2014.05.06"
155+
#define PACKAGE_STRING "ccminer 2014.05.10"
156156

157157
/* Define to the one symbol short name of this package. */
158158
#undef PACKAGE_TARNAME
@@ -161,7 +161,7 @@
161161
#undef PACKAGE_URL
162162

163163
/* Define to the version of this package. */
164-
#define PACKAGE_VERSION "2014.05.06"
164+
#define PACKAGE_VERSION "2014.05.10"
165165

166166
/* If using the C implementation of alloca, define if you know the
167167
direction of stack growth for your system; otherwise it will be

‎cuda_myriadgroestl.cu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Auf Myriadcoin spezialisierte Version von Groestl inkl. Bitslice
1+
// Auf Myriadcoin spezialisierte Version von Groestl
22

33
#include <cuda.h>
44
#include "cuda_runtime.h"

‎miner.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,10 @@ extern int scanhash_nist5(int thr_id, uint32_t *pdata,
235235
const uint32_t *ptarget, uint32_t max_nonce,
236236
unsigned long *hashes_done);
237237

238+
extern int scanhash_x11(int thr_id, uint32_t *pdata,
239+
const uint32_t *ptarget, uint32_t max_nonce,
240+
unsigned long *hashes_done);
241+
238242
extern void fugue256_hash(unsigned char* output, const unsigned char* input, int len);
239243
extern void heavycoin_hash(unsigned char* output, const unsigned char* input, int len);
240244
extern void groestlcoin_hash(unsigned char* output, const unsigned char* input, int len);

0 commit comments

Comments
 (0)