Skip to content

Update for 64-bit OpenCL #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skralg wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update for 64-bit OpenCL #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1803bf
Update for 64-bit OpenCL
skralg Jul 17, 2025
b96be6b
Recommented processor architecture
skralg Jul 17, 2025
f150531
Revert Windows subsystem versions
skralg Jul 18, 2025
b249d71
Allow both 32 and 64 bit OpenCL builds via uncommenting
skralg Jul 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion common/cputypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@
#if defined(_WIN64)
#define CLIENT_OS OS_WIN64
#define CLIENT_OS_NAME "Win64"
#if defined(_M_AMD64)
#if defined(OPENCL)
#define CLIENT_CPU CPU_OPENCL
#elif defined(_M_AMD64)
#define CLIENT_CPU CPU_AMD64
#elif defined(_M_IA64)
#define CLIENT_CPU CPU_IA64
Expand Down
3 changes: 1 addition & 2 deletions common/problem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ static unsigned int __problem_counter = 0;
*/

/* ------------------------------------------------------------------- */

#if (SIZEOF_LONG == 8) /* SIZEOF_LONG is defined in cputypes.h */
#if (SIZEOF_LONG == 8 || (CLIENT_OS == OS_WIN64 && CLIENT_CPU == CPU_OPENCL)) /* SIZEOF_LONG is defined in cputypes.h */
# include "pack8.h"
#else
# include "pack4.h"
Expand Down
37 changes: 32 additions & 5 deletions makefile.vc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
#PROCESSOR_ARCHITECTURE = AMD64
#PROCESSOR_ARCHITECTURE = cuda
#PROCESSOR_ARCHITECTURE = ATI_STREAM
#PROCESSOR_ARCHITECTURE = OPENCL
#PROCESSOR_ARCHITECTURE = OPENCL32
#PROCESSOR_ARCHITECTURE = OPENCL64
#PROCESSOR_ARCHITECTURE = arm

BASENAME = dnetc
Expand Down Expand Up @@ -62,12 +63,18 @@ OPTS_M_PLAT = IX86
CHIPSRCPATH = plat
#CHIPSRCPATH = plat/$(PROCESSOR_ARCHITECTURE)
ZIPSUFFIX = win32-x86-stream
!elseif "$(PROCESSOR_ARCHITECTURE)" == "OPENCL"
!elseif "$(PROCESSOR_ARCHITECTURE)" == "OPENCL32"
HAVE_OGR_CORES = 0
OPTS_CC_CPU =
OPTS_M_PLAT = IX86
CHIPSRCPATH = plat
ZIPSUFFIX = win32-x86-opencl
!elseif "$(PROCESSOR_ARCHITECTURE)" == "OPENCL64"
HAVE_OGR_CORES = 0
OPTS_CC_CPU =
OPTS_M_PLAT = AMD64
CHIPSRCPATH = plat
ZIPSUFFIX = win64-amd64-opencl
!elseif "$(PROCESSOR_ARCHITECTURE)" == "arm"
HAVE_OGR_CORES = 0
OPTS_CC_CPU = /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1
Expand Down Expand Up @@ -220,12 +227,18 @@ ZIPEXTRAS = $(ZIPEXTRAS) docs\readme.stream

# OpenCL support

!if "$(PROCESSOR_ARCHITECTURE)" == "OPENCL"
!if "$(PROCESSOR_ARCHITECTURE)" == "OPENCL32"
OPTS_MSVC = $(OPTS_MSVC) -I"$(OPENCLDIR)include" -Iplat\opencl -Iplat\x86
OPTS_LIBS = $(OPTS_LIBS) "$(OPENCLDIR)lib\x86\OpenCL.lib"
ZIPEXTRAS = $(ZIPEXTRAS) docs\readme.opencl
!endif

!if "$(PROCESSOR_ARCHITECTURE)" == "OPENCL64"
OPTS_MSVC = $(OPTS_MSVC) -I"$(OPENCLDIR)include" -Iplat\opencl -Iplat\amd64
OPTS_LIBS = $(OPTS_LIBS) "$(OPENCLDIR)lib\x86_64\opencl.lib"
ZIPEXTRAS = $(ZIPEXTRAS) docs\readme.opencl
!endif

# --------------------------------------------

all: $(BASENAME).exe $(BASENAME).com $(BASENAME).scr
Expand Down Expand Up @@ -406,7 +419,7 @@ RC5_72_OBJS = \
$(OUTPUTPATH)/adl.obj

OPTS_MSVC = $(OPTS_MSVC) -DHAVE_RC5_72_CORES -DATI_STREAM -DDYN_TIMESLICE
!elseif "$(PROCESSOR_ARCHITECTURE)" == "OPENCL"
!elseif "$(PROCESSOR_ARCHITECTURE)" == "OPENCL32" || "$(PROCESSOR_ARCHITECTURE)" == "OPENCL64"
RC5_72_OBJS = \
$(OUTPUTPATH)/ocl_info.obj \
$(OUTPUTPATH)/ocl_setup.obj \
Expand Down Expand Up @@ -599,7 +612,7 @@ $(VC_CHECK):
{$(RC572SRCPATH)/stream}.cpp{$(OUTPUTPATH)}.obj::
cl -c $(OPTS_MSVC) -Ox -Fo$(OUTPUTPATH)\ $<

!elseif "$(PROCESSOR_ARCHITECTURE)" == "OPENCL"
!elseif "$(PROCESSOR_ARCHITECTURE)" == "OPENCL32"

{$(CHIPSRCPATH)/x86}.asm{$(OUTPUTPATH)}.obj:
nasmw -o $(@:/=\) -f win32 -i $(CHIPSRCPATH:/=\) $(**:/=\)
Expand All @@ -613,6 +626,20 @@ $(VC_CHECK):
{$(RC572SRCPATH)/opencl}.cpp{$(OUTPUTPATH)}.obj::
cl -c -O2 $(OPTS_MSVC) -Fo$(OUTPUTPATH)\ $<

!elseif "$(PROCESSOR_ARCHITECTURE)" == "OPENCL64"

{$(CHIPSRCPATH)/amd64}.asm{$(OUTPUTPATH)}.obj:
nasmw -o $(@:/=\) -f win64 -i $(CHIPSRCPATH:/=\) $(**:/=\)

{$(CHIPSRCPATH)/amd64}.cpp{$(OUTPUTPATH)}.obj::
cl -c $(OPTS_MSVC) -Ox -Fo$(OUTPUTPATH)\ $<

{$(CHIPSRCPATH)/opencl}.cpp{$(OUTPUTPATH)}.obj::
cl -c $(OPTS_MSVC) -Ox -Fo$(OUTPUTPATH)\ $<

{$(RC572SRCPATH)/opencl}.cpp{$(OUTPUTPATH)}.obj::
cl -c -O2 $(OPTS_MSVC) -Fo$(OUTPUTPATH)\ $<

!elseif "$(PROCESSOR_ARCHITECTURE)" == "arm"

{$(RC572SRCPATH)/arm}.asm{$(OUTPUTPATH)}.obj:
Expand Down