diff options
author | Cedric Nugteren <web@cedricnugteren.nl> | 2017-06-21 23:07:47 +0200 |
---|---|---|
committer | Cedric Nugteren <web@cedricnugteren.nl> | 2017-06-21 23:07:47 +0200 |
commit | 615a7fdc81b9b99829152a4d0070cb5d4448a5e5 (patch) | |
tree | c8773fe797573a4c48b41e387dedcc0ab75ae810 /src | |
parent | e44feb85763c5dbae66beb51892d8dda2126e04c (diff) |
Fixes some compilation issues related to the database structure change
Diffstat (limited to 'src')
-rw-r--r-- | src/clblast.cpp | 12 | ||||
-rw-r--r-- | src/database/kernels/copy.hpp | 10 | ||||
-rw-r--r-- | src/database/kernels/pad.hpp | 10 | ||||
-rw-r--r-- | src/database/kernels/padtranspose.hpp | 10 | ||||
-rw-r--r-- | src/database/kernels/transpose.hpp | 10 | ||||
-rw-r--r-- | src/database/kernels/xaxpy.hpp | 10 | ||||
-rw-r--r-- | src/database/kernels/xdot.hpp | 10 | ||||
-rw-r--r-- | src/database/kernels/xgemm.hpp | 10 | ||||
-rw-r--r-- | src/database/kernels/xgemm_direct.hpp | 10 | ||||
-rw-r--r-- | src/database/kernels/xgemv.hpp | 10 | ||||
-rw-r--r-- | src/database/kernels/xgemv_fast.hpp | 10 | ||||
-rw-r--r-- | src/database/kernels/xgemv_fast_rot.hpp | 10 | ||||
-rw-r--r-- | src/database/kernels/xger.hpp | 10 |
13 files changed, 70 insertions, 62 deletions
diff --git a/src/clblast.cpp b/src/clblast.cpp index a73b67f3..ca401066 100644 --- a/src/clblast.cpp +++ b/src/clblast.cpp @@ -2474,10 +2474,18 @@ StatusCode OverrideParameters(const cl_device_id device, const std::string &kern BinaryCache::Instance().Remove(BinaryKey{precision, routine_name, device_name}); } + // Retrieves the names and values separately + auto parameter_values = std::vector<size_t>(); + auto parameter_names = std::vector<std::string>(); + for (const auto ¶meter : parameters) { + parameter_values.push_back(parameter.second); + parameter_names.push_back(parameter.first); + } + // Creates a small custom database based on the provided parameters - const auto database_device = Database::DatabaseDevice{"default", parameters}; + const auto database_device = Database::DatabaseDevice{"default", parameter_values}; const auto database_vendor = Database::DatabaseVendor{database::kDeviceTypeAll, "default", {database_device}}; - const auto database_entry = Database::DatabaseEntry{kernel_name, precision, {database_vendor}}; + const auto database_entry = Database::DatabaseEntry{kernel_name, precision, parameter_names, {database_vendor}}; const auto database_entries = std::vector<Database::DatabaseEntry>{database_entry}; const auto database = Database(device_cpp, kernel_name, precision, database_entries); diff --git a/src/database/kernels/copy.hpp b/src/database/kernels/copy.hpp index a79918ea..259f95c3 100644 --- a/src/database/kernels/copy.hpp +++ b/src/database/kernels/copy.hpp @@ -16,7 +16,7 @@ namespace database { // ================================================================================================= const Database::DatabaseEntry CopyHalf = { - "Copy", Precision::kHalf, {"COPY_DIMX" "COPY_DIMY" "COPY_VW" "COPY_WPT"}, { + "Copy", Precision::kHalf, {"COPY_DIMX", "COPY_DIMY", "COPY_VW", "COPY_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "Ellesmere", { 16, 8, 4, 4 } }, @@ -41,7 +41,7 @@ const Database::DatabaseEntry CopyHalf = { // ================================================================================================= const Database::DatabaseEntry CopySingle = { - "Copy", Precision::kSingle, {"COPY_DIMX" "COPY_DIMY" "COPY_VW" "COPY_WPT"}, { + "Copy", Precision::kSingle, {"COPY_DIMX", "COPY_DIMY", "COPY_VW", "COPY_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 32, 8, 4, 1 } }, @@ -124,7 +124,7 @@ const Database::DatabaseEntry CopySingle = { // ================================================================================================= const Database::DatabaseEntry CopyComplexSingle = { - "Copy", Precision::kComplexSingle, {"COPY_DIMX" "COPY_DIMY" "COPY_VW" "COPY_WPT"}, { + "Copy", Precision::kComplexSingle, {"COPY_DIMX", "COPY_DIMY", "COPY_VW", "COPY_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 32, 8, 1, 1 } }, @@ -198,7 +198,7 @@ const Database::DatabaseEntry CopyComplexSingle = { // ================================================================================================= const Database::DatabaseEntry CopyDouble = { - "Copy", Precision::kDouble, {"COPY_DIMX" "COPY_DIMY" "COPY_VW" "COPY_WPT"}, { + "Copy", Precision::kDouble, {"COPY_DIMX", "COPY_DIMY", "COPY_VW", "COPY_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 32, 8, 1, 1 } }, @@ -266,7 +266,7 @@ const Database::DatabaseEntry CopyDouble = { // ================================================================================================= const Database::DatabaseEntry CopyComplexDouble = { - "Copy", Precision::kComplexDouble, {"COPY_DIMX" "COPY_DIMY" "COPY_VW" "COPY_WPT"}, { + "Copy", Precision::kComplexDouble, {"COPY_DIMX", "COPY_DIMY", "COPY_VW", "COPY_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 8, 16, 1, 1 } }, diff --git a/src/database/kernels/pad.hpp b/src/database/kernels/pad.hpp index 4c996e5c..f925d07d 100644 --- a/src/database/kernels/pad.hpp +++ b/src/database/kernels/pad.hpp @@ -16,7 +16,7 @@ namespace database { // ================================================================================================= const Database::DatabaseEntry PadHalf = { - "Pad", Precision::kHalf, {"PAD_DIMX" "PAD_DIMY" "PAD_WPTX" "PAD_WPTY"}, { + "Pad", Precision::kHalf, {"PAD_DIMX", "PAD_DIMY", "PAD_WPTX", "PAD_WPTY"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "Ellesmere", { 16, 8, 1, 2 } }, @@ -41,7 +41,7 @@ const Database::DatabaseEntry PadHalf = { // ================================================================================================= const Database::DatabaseEntry PadSingle = { - "Pad", Precision::kSingle, {"PAD_DIMX" "PAD_DIMY" "PAD_WPTX" "PAD_WPTY"}, { + "Pad", Precision::kSingle, {"PAD_DIMX", "PAD_DIMY", "PAD_WPTX", "PAD_WPTY"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 32, 8, 1, 1 } }, @@ -124,7 +124,7 @@ const Database::DatabaseEntry PadSingle = { // ================================================================================================= const Database::DatabaseEntry PadComplexSingle = { - "Pad", Precision::kComplexSingle, {"PAD_DIMX" "PAD_DIMY" "PAD_WPTX" "PAD_WPTY"}, { + "Pad", Precision::kComplexSingle, {"PAD_DIMX", "PAD_DIMY", "PAD_WPTX", "PAD_WPTY"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 32, 8, 1, 1 } }, @@ -206,7 +206,7 @@ const Database::DatabaseEntry PadComplexSingle = { // ================================================================================================= const Database::DatabaseEntry PadDouble = { - "Pad", Precision::kDouble, {"PAD_DIMX" "PAD_DIMY" "PAD_WPTX" "PAD_WPTY"}, { + "Pad", Precision::kDouble, {"PAD_DIMX", "PAD_DIMY", "PAD_WPTX", "PAD_WPTY"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 32, 8, 1, 1 } }, @@ -274,7 +274,7 @@ const Database::DatabaseEntry PadDouble = { // ================================================================================================= const Database::DatabaseEntry PadComplexDouble = { - "Pad", Precision::kComplexDouble, {"PAD_DIMX" "PAD_DIMY" "PAD_WPTX" "PAD_WPTY"}, { + "Pad", Precision::kComplexDouble, {"PAD_DIMX", "PAD_DIMY", "PAD_WPTX", "PAD_WPTY"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 16, 8, 1, 1 } }, diff --git a/src/database/kernels/padtranspose.hpp b/src/database/kernels/padtranspose.hpp index a7fc50e4..b80a1666 100644 --- a/src/database/kernels/padtranspose.hpp +++ b/src/database/kernels/padtranspose.hpp @@ -16,7 +16,7 @@ namespace database { // ================================================================================================= const Database::DatabaseEntry PadtransposeHalf = { - "Padtranspose", Precision::kHalf, {"PADTRA_PAD" "PADTRA_TILE" "PADTRA_WPT"}, { + "Padtranspose", Precision::kHalf, {"PADTRA_PAD", "PADTRA_TILE", "PADTRA_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "Ellesmere", { 0, 16, 4 } }, @@ -41,7 +41,7 @@ const Database::DatabaseEntry PadtransposeHalf = { // ================================================================================================= const Database::DatabaseEntry PadtransposeSingle = { - "Padtranspose", Precision::kSingle, {"PADTRA_PAD" "PADTRA_TILE" "PADTRA_WPT"}, { + "Padtranspose", Precision::kSingle, {"PADTRA_PAD", "PADTRA_TILE", "PADTRA_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 0, 16, 4 } }, @@ -123,7 +123,7 @@ const Database::DatabaseEntry PadtransposeSingle = { // ================================================================================================= const Database::DatabaseEntry PadtransposeComplexSingle = { - "Padtranspose", Precision::kComplexSingle, {"PADTRA_PAD" "PADTRA_TILE" "PADTRA_WPT"}, { + "Padtranspose", Precision::kComplexSingle, {"PADTRA_PAD", "PADTRA_TILE", "PADTRA_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 0, 16, 4 } }, @@ -205,7 +205,7 @@ const Database::DatabaseEntry PadtransposeComplexSingle = { // ================================================================================================= const Database::DatabaseEntry PadtransposeDouble = { - "Padtranspose", Precision::kDouble, {"PADTRA_PAD" "PADTRA_TILE" "PADTRA_WPT"}, { + "Padtranspose", Precision::kDouble, {"PADTRA_PAD", "PADTRA_TILE", "PADTRA_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 0, 16, 4 } }, @@ -273,7 +273,7 @@ const Database::DatabaseEntry PadtransposeDouble = { // ================================================================================================= const Database::DatabaseEntry PadtransposeComplexDouble = { - "Padtranspose", Precision::kComplexDouble, {"PADTRA_PAD" "PADTRA_TILE" "PADTRA_WPT"}, { + "Padtranspose", Precision::kComplexDouble, {"PADTRA_PAD", "PADTRA_TILE", "PADTRA_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 0, 8, 4 } }, diff --git a/src/database/kernels/transpose.hpp b/src/database/kernels/transpose.hpp index 30d4dacd..446b632c 100644 --- a/src/database/kernels/transpose.hpp +++ b/src/database/kernels/transpose.hpp @@ -16,7 +16,7 @@ namespace database { // ================================================================================================= const Database::DatabaseEntry TransposeHalf = { - "Transpose", Precision::kHalf, {"TRA_DIM" "TRA_PAD" "TRA_SHUFFLE" "TRA_WPT"}, { + "Transpose", Precision::kHalf, {"TRA_DIM", "TRA_PAD", "TRA_SHUFFLE", "TRA_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "Ellesmere", { 4, 0, 1, 8 } }, @@ -41,7 +41,7 @@ const Database::DatabaseEntry TransposeHalf = { // ================================================================================================= const Database::DatabaseEntry TransposeSingle = { - "Transpose", Precision::kSingle, {"TRA_DIM" "TRA_PAD" "TRA_SHUFFLE" "TRA_WPT"}, { + "Transpose", Precision::kSingle, {"TRA_DIM", "TRA_PAD", "TRA_SHUFFLE", "TRA_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 4, 0, 1, 8 } }, @@ -124,7 +124,7 @@ const Database::DatabaseEntry TransposeSingle = { // ================================================================================================= const Database::DatabaseEntry TransposeComplexSingle = { - "Transpose", Precision::kComplexSingle, {"TRA_DIM" "TRA_PAD" "TRA_SHUFFLE" "TRA_WPT"}, { + "Transpose", Precision::kComplexSingle, {"TRA_DIM", "TRA_PAD", "TRA_SHUFFLE", "TRA_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 4, 1, 1, 4 } }, @@ -200,7 +200,7 @@ const Database::DatabaseEntry TransposeComplexSingle = { // ================================================================================================= const Database::DatabaseEntry TransposeDouble = { - "Transpose", Precision::kDouble, {"TRA_DIM" "TRA_PAD" "TRA_SHUFFLE" "TRA_WPT"}, { + "Transpose", Precision::kDouble, {"TRA_DIM", "TRA_PAD", "TRA_SHUFFLE", "TRA_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 4, 0, 1, 4 } }, @@ -268,7 +268,7 @@ const Database::DatabaseEntry TransposeDouble = { // ================================================================================================= const Database::DatabaseEntry TransposeComplexDouble = { - "Transpose", Precision::kComplexDouble, {"TRA_DIM" "TRA_PAD" "TRA_SHUFFLE" "TRA_WPT"}, { + "Transpose", Precision::kComplexDouble, {"TRA_DIM", "TRA_PAD", "TRA_SHUFFLE", "TRA_WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 4, 1, 1, 2 } }, diff --git a/src/database/kernels/xaxpy.hpp b/src/database/kernels/xaxpy.hpp index 1a7ec766..58cde9d3 100644 --- a/src/database/kernels/xaxpy.hpp +++ b/src/database/kernels/xaxpy.hpp @@ -16,7 +16,7 @@ namespace database { // ================================================================================================= const Database::DatabaseEntry XaxpyHalf = { - "Xaxpy", Precision::kHalf, {"VW" "WGS" "WPT"}, { + "Xaxpy", Precision::kHalf, {"VW", "WGS", "WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "Ellesmere", { 4, 128, 4 } }, @@ -41,7 +41,7 @@ const Database::DatabaseEntry XaxpyHalf = { // ================================================================================================= const Database::DatabaseEntry XaxpySingle = { - "Xaxpy", Precision::kSingle, {"VW" "WGS" "WPT"}, { + "Xaxpy", Precision::kSingle, {"VW", "WGS", "WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 1, 128, 1 } }, @@ -124,7 +124,7 @@ const Database::DatabaseEntry XaxpySingle = { // ================================================================================================= const Database::DatabaseEntry XaxpyComplexSingle = { - "Xaxpy", Precision::kComplexSingle, {"VW" "WGS" "WPT"}, { + "Xaxpy", Precision::kComplexSingle, {"VW", "WGS", "WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 2, 64, 8 } }, @@ -206,7 +206,7 @@ const Database::DatabaseEntry XaxpyComplexSingle = { // ================================================================================================= const Database::DatabaseEntry XaxpyDouble = { - "Xaxpy", Precision::kDouble, {"VW" "WGS" "WPT"}, { + "Xaxpy", Precision::kDouble, {"VW", "WGS", "WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 1, 256, 1 } }, @@ -274,7 +274,7 @@ const Database::DatabaseEntry XaxpyDouble = { // ================================================================================================= const Database::DatabaseEntry XaxpyComplexDouble = { - "Xaxpy", Precision::kComplexDouble, {"VW" "WGS" "WPT"}, { + "Xaxpy", Precision::kComplexDouble, {"VW", "WGS", "WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 1, 128, 1 } }, diff --git a/src/database/kernels/xdot.hpp b/src/database/kernels/xdot.hpp index 1ceec4e8..d234c558 100644 --- a/src/database/kernels/xdot.hpp +++ b/src/database/kernels/xdot.hpp @@ -16,7 +16,7 @@ namespace database { // ================================================================================================= const Database::DatabaseEntry XdotHalf = { - "Xdot", Precision::kHalf, {"WGS1" "WGS2"}, { + "Xdot", Precision::kHalf, {"WGS1", "WGS2"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "Ellesmere", { 256, 64 } }, @@ -41,7 +41,7 @@ const Database::DatabaseEntry XdotHalf = { // ================================================================================================= const Database::DatabaseEntry XdotSingle = { - "Xdot", Precision::kSingle, {"WGS1" "WGS2"}, { + "Xdot", Precision::kSingle, {"WGS1", "WGS2"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 128, 32 } }, @@ -106,7 +106,7 @@ const Database::DatabaseEntry XdotSingle = { // ================================================================================================= const Database::DatabaseEntry XdotComplexSingle = { - "Xdot", Precision::kComplexSingle, {"WGS1" "WGS2"}, { + "Xdot", Precision::kComplexSingle, {"WGS1", "WGS2"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 64, 32 } }, @@ -170,7 +170,7 @@ const Database::DatabaseEntry XdotComplexSingle = { // ================================================================================================= const Database::DatabaseEntry XdotDouble = { - "Xdot", Precision::kDouble, {"WGS1" "WGS2"}, { + "Xdot", Precision::kDouble, {"WGS1", "WGS2"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 64, 128 } }, @@ -221,7 +221,7 @@ const Database::DatabaseEntry XdotDouble = { // ================================================================================================= const Database::DatabaseEntry XdotComplexDouble = { - "Xdot", Precision::kComplexDouble, {"WGS1" "WGS2"}, { + "Xdot", Precision::kComplexDouble, {"WGS1", "WGS2"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 64, 32 } }, diff --git a/src/database/kernels/xgemm.hpp b/src/database/kernels/xgemm.hpp index 6fca7e7e..2270dd44 100644 --- a/src/database/kernels/xgemm.hpp +++ b/src/database/kernels/xgemm.hpp @@ -16,7 +16,7 @@ namespace database { // ================================================================================================= const Database::DatabaseEntry XgemmHalf = { - "Xgemm", Precision::kHalf, {"KWG" "KWI" "MDIMA" "MDIMC" "MWG" "NDIMB" "NDIMC" "NWG" "SA" "SB" "STRM" "STRN" "VWM" "VWN"}, { + "Xgemm", Precision::kHalf, {"KWG", "KWI", "MDIMA", "MDIMC", "MWG", "NDIMB", "NDIMC", "NWG", "SA", "SB", "STRM", "STRN", "VWM", "VWN"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "Ellesmere", { 32, 2, 8, 8, 64, 16, 16, 64, 1, 1, 0, 0, 4, 4 } }, @@ -40,7 +40,7 @@ const Database::DatabaseEntry XgemmHalf = { // ================================================================================================= const Database::DatabaseEntry XgemmSingle = { - "Xgemm", Precision::kSingle, {"KWG" "KWI" "MDIMA" "MDIMC" "MWG" "NDIMB" "NDIMC" "NWG" "SA" "SB" "STRM" "STRN" "VWM" "VWN"}, { + "Xgemm", Precision::kSingle, {"KWG", "KWI", "MDIMA", "MDIMC", "MWG", "NDIMB", "NDIMC", "NWG", "SA", "SB", "STRM", "STRN", "VWM", "VWN"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 32, 2, 16, 16, 64, 8, 16, 128, 0, 0, 0, 0, 2, 8 } }, @@ -123,7 +123,7 @@ const Database::DatabaseEntry XgemmSingle = { // ================================================================================================= const Database::DatabaseEntry XgemmComplexSingle = { - "Xgemm", Precision::kComplexSingle, {"KWG" "KWI" "MDIMA" "MDIMC" "MWG" "NDIMB" "NDIMC" "NWG" "SA" "SB" "STRM" "STRN" "VWM" "VWN"}, { + "Xgemm", Precision::kComplexSingle, {"KWG", "KWI", "MDIMA", "MDIMC", "MWG", "NDIMB", "NDIMC", "NWG", "SA", "SB", "STRM", "STRN", "VWM", "VWN"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 32, 2, 32, 32, 64, 8, 8, 64, 0, 0, 1, 1, 2, 8 } }, @@ -205,7 +205,7 @@ const Database::DatabaseEntry XgemmComplexSingle = { // ================================================================================================= const Database::DatabaseEntry XgemmDouble = { - "Xgemm", Precision::kDouble, {"KWG" "KWI" "MDIMA" "MDIMC" "MWG" "NDIMB" "NDIMC" "NWG" "SA" "SB" "STRM" "STRN" "VWM" "VWN"}, { + "Xgemm", Precision::kDouble, {"KWG", "KWI", "MDIMA", "MDIMC", "MWG", "NDIMB", "NDIMC", "NWG", "SA", "SB", "STRM", "STRN", "VWM", "VWN"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 32, 2, 16, 16, 64, 8, 8, 32, 0, 0, 0, 0, 4, 4 } }, @@ -273,7 +273,7 @@ const Database::DatabaseEntry XgemmDouble = { // ================================================================================================= const Database::DatabaseEntry XgemmComplexDouble = { - "Xgemm", Precision::kComplexDouble, {"KWG" "KWI" "MDIMA" "MDIMC" "MWG" "NDIMB" "NDIMC" "NWG" "SA" "SB" "STRM" "STRN" "VWM" "VWN"}, { + "Xgemm", Precision::kComplexDouble, {"KWG", "KWI", "MDIMA", "MDIMC", "MWG", "NDIMB", "NDIMC", "NWG", "SA", "SB", "STRM", "STRN", "VWM", "VWN"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 32, 8, 8, 16, 32, 16, 16, 32, 0, 0, 1, 1, 2, 2 } }, diff --git a/src/database/kernels/xgemm_direct.hpp b/src/database/kernels/xgemm_direct.hpp index a2e45e07..7a1cd983 100644 --- a/src/database/kernels/xgemm_direct.hpp +++ b/src/database/kernels/xgemm_direct.hpp @@ -16,7 +16,7 @@ namespace database { // ================================================================================================= const Database::DatabaseEntry XgemmDirectHalf = { - "XgemmDirect", Precision::kHalf, {"KWID" "MDIMAD" "MDIMCD" "NDIMBD" "NDIMCD" "PADA" "PADB" "VWMD" "VWND" "WGD"}, { + "XgemmDirect", Precision::kHalf, {"KWID", "MDIMAD", "MDIMCD", "NDIMBD", "NDIMCD", "PADA", "PADB", "VWMD", "VWND", "WGD"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "Ellesmere", { 8, 32, 8, 8, 32, 1, 1, 1, 1, 32 } }, @@ -40,7 +40,7 @@ const Database::DatabaseEntry XgemmDirectHalf = { // ================================================================================================= const Database::DatabaseEntry XgemmDirectSingle = { - "XgemmDirect", Precision::kSingle, {"KWID" "MDIMAD" "MDIMCD" "NDIMBD" "NDIMCD" "PADA" "PADB" "VWMD" "VWND" "WGD"}, { + "XgemmDirect", Precision::kSingle, {"KWID", "MDIMAD", "MDIMCD", "NDIMBD", "NDIMCD", "PADA", "PADB", "VWMD", "VWND", "WGD"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 2, 8, 8, 8, 8, 1, 1, 2, 2, 32 } }, @@ -88,7 +88,7 @@ const Database::DatabaseEntry XgemmDirectSingle = { // ================================================================================================= const Database::DatabaseEntry XgemmDirectComplexSingle = { - "XgemmDirect", Precision::kComplexSingle, {"KWID" "MDIMAD" "MDIMCD" "NDIMBD" "NDIMCD" "PADA" "PADB" "VWMD" "VWND" "WGD"}, { + "XgemmDirect", Precision::kComplexSingle, {"KWID", "MDIMAD", "MDIMCD", "NDIMBD", "NDIMCD", "PADA", "PADB", "VWMD", "VWND", "WGD"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 2, 16, 16, 16, 16, 1, 1, 1, 1, 16 } }, @@ -134,7 +134,7 @@ const Database::DatabaseEntry XgemmDirectComplexSingle = { // ================================================================================================= const Database::DatabaseEntry XgemmDirectDouble = { - "XgemmDirect", Precision::kDouble, {"KWID" "MDIMAD" "MDIMCD" "NDIMBD" "NDIMCD" "PADA" "PADB" "VWMD" "VWND" "WGD"}, { + "XgemmDirect", Precision::kDouble, {"KWID", "MDIMAD", "MDIMCD", "NDIMBD", "NDIMCD", "PADA", "PADB", "VWMD", "VWND", "WGD"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 2, 16, 16, 8, 8, 1, 1, 1, 1, 16 } }, @@ -172,7 +172,7 @@ const Database::DatabaseEntry XgemmDirectDouble = { // ================================================================================================= const Database::DatabaseEntry XgemmDirectComplexDouble = { - "XgemmDirect", Precision::kComplexDouble, {"KWID" "MDIMAD" "MDIMCD" "NDIMBD" "NDIMCD" "PADA" "PADB" "VWMD" "VWND" "WGD"}, { + "XgemmDirect", Precision::kComplexDouble, {"KWID", "MDIMAD", "MDIMCD", "NDIMBD", "NDIMCD", "PADA", "PADB", "VWMD", "VWND", "WGD"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 2, 16, 16, 16, 16, 1, 1, 1, 1, 16 } }, diff --git a/src/database/kernels/xgemv.hpp b/src/database/kernels/xgemv.hpp index 093af6e3..7adb6f10 100644 --- a/src/database/kernels/xgemv.hpp +++ b/src/database/kernels/xgemv.hpp @@ -16,7 +16,7 @@ namespace database { // ================================================================================================= const Database::DatabaseEntry XgemvHalf = { - "Xgemv", Precision::kHalf, {"WGS1" "WPT1"}, { + "Xgemv", Precision::kHalf, {"WGS1", "WPT1"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "Ellesmere", { 256, 1 } }, @@ -41,7 +41,7 @@ const Database::DatabaseEntry XgemvHalf = { // ================================================================================================= const Database::DatabaseEntry XgemvSingle = { - "Xgemv", Precision::kSingle, {"WGS1" "WPT1"}, { + "Xgemv", Precision::kSingle, {"WGS1", "WPT1"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 128, 1 } }, @@ -117,7 +117,7 @@ const Database::DatabaseEntry XgemvSingle = { // ================================================================================================= const Database::DatabaseEntry XgemvComplexSingle = { - "Xgemv", Precision::kComplexSingle, {"WGS1" "WPT1"}, { + "Xgemv", Precision::kComplexSingle, {"WGS1", "WPT1"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 64, 1 } }, @@ -188,7 +188,7 @@ const Database::DatabaseEntry XgemvComplexSingle = { // ================================================================================================= const Database::DatabaseEntry XgemvDouble = { - "Xgemv", Precision::kDouble, {"WGS1" "WPT1"}, { + "Xgemv", Precision::kDouble, {"WGS1", "WPT1"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 64, 1 } }, @@ -249,7 +249,7 @@ const Database::DatabaseEntry XgemvDouble = { // ================================================================================================= const Database::DatabaseEntry XgemvComplexDouble = { - "Xgemv", Precision::kComplexDouble, {"WGS1" "WPT1"}, { + "Xgemv", Precision::kComplexDouble, {"WGS1", "WPT1"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 64, 1 } }, diff --git a/src/database/kernels/xgemv_fast.hpp b/src/database/kernels/xgemv_fast.hpp index 08183936..8c42aa0e 100644 --- a/src/database/kernels/xgemv_fast.hpp +++ b/src/database/kernels/xgemv_fast.hpp @@ -16,7 +16,7 @@ namespace database { // ================================================================================================= const Database::DatabaseEntry XgemvFastHalf = { - "XgemvFast", Precision::kHalf, {"VW2" "WGS2" "WPT2"}, { + "XgemvFast", Precision::kHalf, {"VW2", "WGS2", "WPT2"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "Ellesmere", { 1, 32, 1 } }, @@ -41,7 +41,7 @@ const Database::DatabaseEntry XgemvFastHalf = { // ================================================================================================= const Database::DatabaseEntry XgemvFastSingle = { - "XgemvFast", Precision::kSingle, {"VW2" "WGS2" "WPT2"}, { + "XgemvFast", Precision::kSingle, {"VW2", "WGS2", "WPT2"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 1, 128, 1 } }, @@ -117,7 +117,7 @@ const Database::DatabaseEntry XgemvFastSingle = { // ================================================================================================= const Database::DatabaseEntry XgemvFastComplexSingle = { - "XgemvFast", Precision::kComplexSingle, {"VW2" "WGS2" "WPT2"}, { + "XgemvFast", Precision::kComplexSingle, {"VW2", "WGS2", "WPT2"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 2, 256, 2 } }, @@ -182,7 +182,7 @@ const Database::DatabaseEntry XgemvFastComplexSingle = { // ================================================================================================= const Database::DatabaseEntry XgemvFastDouble = { - "XgemvFast", Precision::kDouble, {"VW2" "WGS2" "WPT2"}, { + "XgemvFast", Precision::kDouble, {"VW2", "WGS2", "WPT2"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 1, 256, 1 } }, @@ -243,7 +243,7 @@ const Database::DatabaseEntry XgemvFastDouble = { // ================================================================================================= const Database::DatabaseEntry XgemvFastComplexDouble = { - "XgemvFast", Precision::kComplexDouble, {"VW2" "WGS2" "WPT2"}, { + "XgemvFast", Precision::kComplexDouble, {"VW2", "WGS2", "WPT2"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 1, 256, 1 } }, diff --git a/src/database/kernels/xgemv_fast_rot.hpp b/src/database/kernels/xgemv_fast_rot.hpp index b7befa2b..644498e2 100644 --- a/src/database/kernels/xgemv_fast_rot.hpp +++ b/src/database/kernels/xgemv_fast_rot.hpp @@ -16,7 +16,7 @@ namespace database { // ================================================================================================= const Database::DatabaseEntry XgemvFastRotHalf = { - "XgemvFastRot", Precision::kHalf, {"VW3" "WGS3" "WPT3"}, { + "XgemvFastRot", Precision::kHalf, {"VW3", "WGS3", "WPT3"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "Ellesmere", { 8, 32, 32 } }, @@ -40,7 +40,7 @@ const Database::DatabaseEntry XgemvFastRotHalf = { // ================================================================================================= const Database::DatabaseEntry XgemvFastRotSingle = { - "XgemvFastRot", Precision::kSingle, {"VW3" "WGS3" "WPT3"}, { + "XgemvFastRot", Precision::kSingle, {"VW3", "WGS3", "WPT3"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 8, 64, 32 } }, @@ -93,7 +93,7 @@ const Database::DatabaseEntry XgemvFastRotSingle = { // ================================================================================================= const Database::DatabaseEntry XgemvFastRotComplexSingle = { - "XgemvFastRot", Precision::kComplexSingle, {"VW3" "WGS3" "WPT3"}, { + "XgemvFastRot", Precision::kComplexSingle, {"VW3", "WGS3", "WPT3"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 8, 16, 16 } }, @@ -135,7 +135,7 @@ const Database::DatabaseEntry XgemvFastRotComplexSingle = { // ================================================================================================= const Database::DatabaseEntry XgemvFastRotDouble = { - "XgemvFastRot", Precision::kDouble, {"VW3" "WGS3" "WPT3"}, { + "XgemvFastRot", Precision::kDouble, {"VW3", "WGS3", "WPT3"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 4, 16, 16 } }, @@ -175,7 +175,7 @@ const Database::DatabaseEntry XgemvFastRotDouble = { // ================================================================================================= const Database::DatabaseEntry XgemvFastRotComplexDouble = { - "XgemvFastRot", Precision::kComplexDouble, {"VW3" "WGS3" "WPT3"}, { + "XgemvFastRot", Precision::kComplexDouble, {"VW3", "WGS3", "WPT3"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 4, 32, 16 } }, diff --git a/src/database/kernels/xger.hpp b/src/database/kernels/xger.hpp index c04120f1..d294ab43 100644 --- a/src/database/kernels/xger.hpp +++ b/src/database/kernels/xger.hpp @@ -16,7 +16,7 @@ namespace database { // ================================================================================================= const Database::DatabaseEntry XgerHalf = { - "Xger", Precision::kHalf, {"WGS1" "WGS2" "WPT"}, { + "Xger", Precision::kHalf, {"WGS1", "WGS2", "WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "Ellesmere", { 64, 1, 2 } }, @@ -41,7 +41,7 @@ const Database::DatabaseEntry XgerHalf = { // ================================================================================================= const Database::DatabaseEntry XgerSingle = { - "Xger", Precision::kSingle, {"WGS1" "WGS2" "WPT"}, { + "Xger", Precision::kSingle, {"WGS1", "WGS2", "WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 256, 1, 1 } }, @@ -112,7 +112,7 @@ const Database::DatabaseEntry XgerSingle = { // ================================================================================================= const Database::DatabaseEntry XgerComplexSingle = { - "Xger", Precision::kComplexSingle, {"WGS1" "WGS2" "WPT"}, { + "Xger", Precision::kComplexSingle, {"WGS1", "WGS2", "WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 64, 4, 1 } }, @@ -182,7 +182,7 @@ const Database::DatabaseEntry XgerComplexSingle = { // ================================================================================================= const Database::DatabaseEntry XgerDouble = { - "Xger", Precision::kDouble, {"WGS1" "WGS2" "WPT"}, { + "Xger", Precision::kDouble, {"WGS1", "WGS2", "WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 32, 4, 1 } }, @@ -239,7 +239,7 @@ const Database::DatabaseEntry XgerDouble = { // ================================================================================================= const Database::DatabaseEntry XgerComplexDouble = { - "Xger", Precision::kComplexDouble, {"WGS1" "WGS2" "WPT"}, { + "Xger", Precision::kComplexDouble, {"WGS1", "WGS2", "WPT"}, { { // AMD GPUs kDeviceTypeGPU, "AMD", { { "AMD Radeon R9 M370X Compute Engine", { 64, 1, 1 } }, |