mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-19 16:38:01 +00:00
d1ef156562Bug: https://bugs.gentoo.org/964799 Signed-off-by: Sv. Lockal <lockalsash@gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44165 Signed-off-by: Sam James <sam@gentoo.org>
96 lines
3.7 KiB
Diff
96 lines
3.7 KiB
Diff
--- a/library/src/handle.cpp
|
|
+++ b/library/src/handle.cpp
|
|
@@ -21,6 +21,7 @@
|
|
* ************************************************************************ */
|
|
#include "handle.hpp"
|
|
#include <cstdarg>
|
|
+#include <cstring>
|
|
#include <limits>
|
|
|
|
#ifdef WIN32
|
|
@@ -333,6 +334,20 @@ Processor _rocblas_handle::getActiveArch()
|
|
// strip out xnack/ecc from name
|
|
std::string deviceFullString(device_properties.gcnArchName);
|
|
std::string deviceString = deviceFullString.substr(0, deviceFullString.find(":"));
|
|
+ // coerce to compatible arch
|
|
+ int gcnArch = deviceString.substr(0, 3) == "gfx" ? std::stoi(deviceString.substr(3)) : 0;
|
|
+ switch(gcnArch)
|
|
+ {
|
|
+ case 902: case 909: case 912:
|
|
+ std::strcpy(device_properties.gcnArchName, "gfx900");
|
|
+ break;
|
|
+ case 1013:
|
|
+ std::strcpy(device_properties.gcnArchName, "gfx1010");
|
|
+ break;
|
|
+ case 1031: case 1032: case 1033: case 1034: case 1035: case 1036:
|
|
+ std::strcpy(device_properties.gcnArchName, "gfx1030");
|
|
+ break;
|
|
+ }
|
|
|
|
if(deviceString.find("gfx803") != std::string::npos)
|
|
{
|
|
--- a/library/src/rocblas_auxiliary.cpp
|
|
+++ b/library/src/rocblas_auxiliary.cpp
|
|
@@ -24,6 +24,7 @@
|
|
#include "logging.hpp"
|
|
#include "rocblas-auxiliary.h"
|
|
#include <cctype>
|
|
+#include <cstring>
|
|
#include <cstdlib>
|
|
#include <memory>
|
|
#include <string>
|
|
@@ -924,6 +925,20 @@ std::string rocblas_internal_get_arch_name()
|
|
hipGetDevice(&deviceId);
|
|
hipDeviceProp_t deviceProperties;
|
|
hipGetDeviceProperties(&deviceProperties, deviceId);
|
|
+ // coerce to compatible arch
|
|
+ int gcnArch = strncmp(deviceProperties.gcnArchName, "gfx", 3) == 0 ? std::stoi(deviceProperties.gcnArchName + 3) : 0;
|
|
+ switch(gcnArch)
|
|
+ {
|
|
+ case 902: case 909: case 912:
|
|
+ std::strcpy(deviceProperties.gcnArchName, "gfx900");
|
|
+ break;
|
|
+ case 1013:
|
|
+ std::strcpy(deviceProperties.gcnArchName, "gfx1010");
|
|
+ break;
|
|
+ case 1031: case 1032: case 1033: case 1034: case 1035: case 1036:
|
|
+ std::strcpy(deviceProperties.gcnArchName, "gfx1030");
|
|
+ break;
|
|
+ }
|
|
return ArchName<hipDeviceProp_t>{}(deviceProperties);
|
|
}
|
|
|
|
--- a/library/src/tensile_host.cpp
|
|
+++ b/library/src/tensile_host.cpp
|
|
@@ -51,6 +51,7 @@
|
|
#include <Tensile/hip/HipUtils.hpp>
|
|
#include <atomic>
|
|
#include <complex>
|
|
+#include <cstring>
|
|
#include <exception>
|
|
#include <future>
|
|
#include <iomanip>
|
|
@@ -831,6 +832,23 @@ namespace
|
|
std::string deviceFullString(prop.gcnArchName);
|
|
std::string deviceString
|
|
= deviceFullString.substr(0, deviceFullString.find(":"));
|
|
+ // coerce to compatible arch
|
|
+ int gcnArch = deviceString.substr(0, 3) == "gfx" ? std::stoi(deviceString.substr(3)) : 0;
|
|
+ switch(gcnArch)
|
|
+ {
|
|
+ case 902: case 909: case 912:
|
|
+ std::strcpy(prop.gcnArchName, "gfx900");
|
|
+ deviceString = prop.gcnArchName;
|
|
+ break;
|
|
+ case 1013:
|
|
+ std::strcpy(prop.gcnArchName, "gfx1010");
|
|
+ deviceString = prop.gcnArchName;
|
|
+ break;
|
|
+ case 1031: case 1032: case 1033: case 1034: case 1035: case 1036:
|
|
+ std::strcpy(prop.gcnArchName, "gfx1030");
|
|
+ deviceString = prop.gcnArchName;
|
|
+ break;
|
|
+ }
|
|
m_devicePropMap[deviceString] = std::make_shared<hipDeviceProp_t>(prop);
|
|
}
|
|
}
|