Substitute correct device ID for AMD driver

Author: SChernykh

RandomX_OpenCL/miner.cpp

@@ -109,7 +109,7 @@ bool test_mining(uint32_t platform_id, uint32_t device_id, size_t intensity, uin
 
 		options.str("");
 		options << "-D RANDOMX_PROGRAM_ITERATIONS=" << RANDOMX_PROGRAM_ITERATIONS;
-		if (!ctx.Compile(gcn_binary, { RANDOMX_RUN_CL }, { CL_RANDOMX_RUN }, options.str(), ALWAYS_USE_BINARY))
+		if (!ctx.Compile(gcn_binary, { RANDOMX_RUN_CL }, { CL_RANDOMX_RUN }, options.str(), ALWAYS_USE_BINARY, ctx.elf_binary_flags))
 		{
 			return false;
 		}

RandomX_OpenCL/opencl_helpers.cpp

@@ -104,7 +104,7 @@ bool OpenCLContext::Init(uint32_t platform_id, uint32_t device_id)
 	return true;
 }
 
-bool OpenCLContext::Compile(const char* binary_name, const std::initializer_list<std::string>& source_files, const std::initializer_list<std::string>& kernel_names, const std::string& options, CachingParameters caching)
+bool OpenCLContext::Compile(const char* binary_name, const std::initializer_list<std::string>& source_files, const std::initializer_list<std::string>& kernel_names, const std::string& options, CachingParameters caching, uint32_t force_elf_binary_flags)
 {
 	std::vector<std::string> source;
 	source.reserve(source_files.size());
@@ -138,7 +138,11 @@ bool OpenCLContext::Compile(const char* binary_name, const std::initializer_list
 			buf.insert(buf.begin(), std::istreambuf_iterator<char>(f), std::istreambuf_iterator<char>());
 
 			const size_t data_length = buf.size();
+			if (force_elf_binary_flags)
+				*(uint32_t*)(buf.data() + 0x30) = force_elf_binary_flags;
+
 			const unsigned char* binary_data = reinterpret_cast<const unsigned char*>(buf.data());
+
 			program = clCreateProgramWithBinary(context, 1, &device, &data_length, &binary_data, nullptr, &err);
 			CL_CHECK_RESULT(clCreateProgramWithBinary);
 
@@ -187,15 +191,17 @@ bool OpenCLContext::Compile(const char* binary_name, const std::initializer_list
 	}
 	std::cout << "done" << std::endl;
 
-	if (!created_with_binary)
-	{
-		size_t bin_size;
-		CL_CHECKED_CALL(clGetProgramInfo, program, CL_PROGRAM_BINARY_SIZES, sizeof(bin_size), &bin_size, nullptr);
+	size_t bin_size;
+	CL_CHECKED_CALL(clGetProgramInfo, program, CL_PROGRAM_BINARY_SIZES, sizeof(bin_size), &bin_size, nullptr);
 
-		std::vector<char> binary_data(bin_size);
-		char* tmp[1] = { binary_data.data() };
-		CL_CHECKED_CALL(clGetProgramInfo, program, CL_PROGRAM_BINARIES, sizeof(tmp), tmp, NULL);
+	std::vector<char> binary_data(bin_size);
+	char* tmp[1] = { binary_data.data() };
+	CL_CHECKED_CALL(clGetProgramInfo, program, CL_PROGRAM_BINARIES, sizeof(tmp), tmp, NULL);
 
+	elf_binary_flags = (bin_size >= 0x34) ? *(uint32_t*)(binary_data.data() + 0x30) : 0;
+
+	if (!created_with_binary)
+	{
 		std::ofstream f(binary_name, std::ios::binary);
 		f.write(tmp[0], bin_size);
 		f.close();

RandomX_OpenCL/opencl_helpers.h

@@ -56,16 +56,18 @@ struct OpenCLContext
 	OpenCLContext()
 		: context(0)
 		, queue(0)
+		, elf_binary_flags(0)
 	{}
 
 	~OpenCLContext();
 
 	bool Init(uint32_t platform_id, uint32_t device_id);
-	bool Compile(const char* binary_name, const std::initializer_list<std::string>& source_files, const std::initializer_list<std::string>& kernel_names, const std::string& options = std::string(), CachingParameters caching = ALWAYS_COMPILE);
+	bool Compile(const char* binary_name, const std::initializer_list<std::string>& source_files, const std::initializer_list<std::string>& kernel_names, const std::string& options = std::string(), CachingParameters caching = ALWAYS_COMPILE, uint32_t force_elf_binary_flags = 0);
 
 	cl_device_id device;
 	cl_context context;
 	cl_command_queue queue;
+	uint32_t elf_binary_flags;
 	std::map<std::string, cl_kernel> kernels;
 
 	std::vector<char> device_name;