haraldwolff
/
CLBlast
mirror of https://github.com/CNugteren/CLBlast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a vendor naming bug in the tuners and in the database

pull/240/head
Cedric Nugteren 2018-01-06 17:02:58 +01:00
parent a7ccce1969
commit c9b5d614e2
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/database/kernels/gemm_routine/gemm_routine_32.hpp
View File

@ -20,6 +20,14 @@ const DatabaseEntry GemmRoutineSingle = {
} },
}
},
{ // Intel CPUs
kDeviceTypeCPU, "Intel", {
{ "default", {
{ Name{"Intel(R) Core(TM) i5-6200U CPU @ 2.30GHz "}, Params{ 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
{ kDeviceNameDefault , Params{ 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
} },
}
},
{ // Intel GPUs
kDeviceTypeGPU, "Intel", {
{ "default", {
@ -28,16 +36,8 @@ const DatabaseEntry GemmRoutineSingle = {
} },
}
},
{ // Intel(R) Corporation CPUs
kDeviceTypeCPU, "Intel(R) Corporation", {
{ "default", {
{ Name{"Intel(R) Core(TM) i5-6200U CPU @ 2.30GHz "}, Params{ 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
{ kDeviceNameDefault , Params{ 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
} },
}
},
{ // NVIDIA Corporation GPUs
kDeviceTypeGPU, "NVIDIA Corporation", {
{ // NVIDIA GPUs
kDeviceTypeGPU, "NVIDIA", {
{ "SM5.0", {
{ Name{"GeForce GTX 750 Ti "}, Params{ 768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
{ kDeviceNameDefault , Params{ 768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },

20
src/database/kernels/gemm_routine/gemm_routine_3232.hpp
View File

@ -12,6 +12,14 @@ namespace database {
const DatabaseEntry GemmRoutineComplexSingle = {
"GemmRoutine", Precision::kComplexSingle, {"XGEMM_MIN_INDIRECT_SIZE"}, {
{ // Intel CPUs
kDeviceTypeCPU, "Intel", {
{ "default", {
{ Name{"Intel(R) Core(TM) i5-6200U CPU @ 2.30GHz "}, Params{ 256, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
{ kDeviceNameDefault , Params{ 256, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
} },
}
},
{ // Intel GPUs
kDeviceTypeGPU, "Intel", {
{ "default", {
@ -20,16 +28,8 @@ const DatabaseEntry GemmRoutineComplexSingle = {
} },
}
},
{ // Intel(R) Corporation CPUs
kDeviceTypeCPU, "Intel(R) Corporation", {
{ "default", {
{ Name{"Intel(R) Core(TM) i5-6200U CPU @ 2.30GHz "}, Params{ 256, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
{ kDeviceNameDefault , Params{ 256, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
} },
}
},
{ // NVIDIA Corporation GPUs
kDeviceTypeGPU, "NVIDIA Corporation", {
{ // NVIDIA GPUs
kDeviceTypeGPU, "NVIDIA", {
{ "SM5.0", {
{ Name{"GeForce GTX 750 Ti "}, Params{ 768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
{ kDeviceNameDefault , Params{ 768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },

8
src/database/kernels/gemm_routine/gemm_routine_64.hpp
View File

@ -12,16 +12,16 @@ namespace database {
const DatabaseEntry GemmRoutineDouble = {
"GemmRoutine", Precision::kDouble, {"XGEMM_MIN_INDIRECT_SIZE"}, {
{ // Intel(R) Corporation CPUs
kDeviceTypeCPU, "Intel(R) Corporation", {
{ // Intel CPUs
kDeviceTypeCPU, "Intel", {
{ "default", {
{ Name{"Intel(R) Core(TM) i5-6200U CPU @ 2.30GHz "}, Params{ 320, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
{ kDeviceNameDefault , Params{ 320, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
} },
}
},
{ // NVIDIA Corporation GPUs
kDeviceTypeGPU, "NVIDIA Corporation", {
{ // NVIDIA GPUs
kDeviceTypeGPU, "NVIDIA", {
{ "SM5.0", {
{ Name{"GeForce GTX 750 Ti "}, Params{ 320, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
{ kDeviceNameDefault , Params{ 320, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },

8
src/database/kernels/gemm_routine/gemm_routine_6464.hpp
View File

@ -12,16 +12,16 @@ namespace database {
const DatabaseEntry GemmRoutineComplexDouble = {
"GemmRoutine", Precision::kComplexDouble, {"XGEMM_MIN_INDIRECT_SIZE"}, {
{ // Intel(R) Corporation CPUs
kDeviceTypeCPU, "Intel(R) Corporation", {
{ // Intel CPUs
kDeviceTypeCPU, "Intel", {
{ "default", {
{ Name{"Intel(R) Core(TM) i5-6200U CPU @ 2.30GHz "}, Params{ 1536, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
{ kDeviceNameDefault , Params{ 1536, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
} },
}
},
{ // NVIDIA Corporation GPUs
kDeviceTypeGPU, "NVIDIA Corporation", {
{ // NVIDIA GPUs
kDeviceTypeGPU, "NVIDIA", {
{ "SM5.0", {
{ Name{"GeForce GTX 750 Ti "}, Params{ 320, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
{ kDeviceNameDefault , Params{ 320, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },

4
src/tuning/tuning.cpp
View File

@ -37,8 +37,8 @@ void PrintTimingsToFileAsJSON(const std::string &filename,
for (auto &datum: metadata) {
fprintf(file, " \"%s\": \"%s\",\n", datum.first.c_str(), datum.second.c_str());
}
fprintf(file, " \"clblast_device_type\": \"%s\",\n", device.Type().c_str());
fprintf(file, " \"clblast_device_vendor\": \"%s\",\n", device.Vendor().c_str());
fprintf(file, " \"clblast_device_type\": \"%s\",\n", GetDeviceType(device).c_str());
fprintf(file, " \"clblast_device_vendor\": \"%s\",\n", GetDeviceVendor(device).c_str());
fprintf(file, " \"clblast_device_architecture\": \"%s\",\n", GetDeviceArchitecture(device).c_str());
fprintf(file, " \"clblast_device_name\": \"%s\",\n", GetDeviceName(device).c_str());
fprintf(file, " \"device\": \"%s\",\n", device.Name().c_str());