AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add support for GC 11.5.0 and 11.5.1"

Browse Source 
Reverting this as current mainline compiler branch does not support
gfx1150/gfx1151 yet. Will bring back later.

This reverts commit e877840197.

Change-Id: I31ff4fb2d5817538094a7ffaeba96dd6a7d660c7
This commit is contained in:
David Yat Sin
2023-07-26 00:39:22 +00:00
parent 469defa78a
commit ebc51dd0eb
9 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/hsa-runtime/image/addrlib/src/amdgpu_asic_addr.h
+1 -5
View File
@@ -46,12 +46,10 @@
#define FAMILY_VGH 0x90
#define FAMILY_GFX1100 0x91
#define FAMILY_GFX1103 0x94
#define FAMILY_GFX1150 0x96
#define FAMILY_RMB 0x92
#define FAMILY_GC_10_3_6 0x95
#define FAMILY_GC_10_3_7 0x97
// AMDGPU_FAMILY_IS(familyId, familyName)
#define FAMILY_IS(f, fn) (f == FAMILY_##fn)
#define FAMILY_IS_TN(f) FAMILY_IS(f, TN)
@@ -67,7 +65,6 @@
#define FAMILY_IS_RMB(f) FAMILY_IS(f, RMB)
#define FAMILY_IS_GFX1100(f) FAMILY_IS(f, GFX1100)
#define FAMILY_IS_GFX1103(f) FAMILY_IS(f, GFX1103)
#define FAMILY_IS_GFX1150(f) FAMILY_IS(f, GFX1150)
#define AMDGPU_UNKNOWN 0xFF
@@ -120,8 +117,8 @@
#define AMDGPU_GFX1100_RANGE 0x01, 0x10
#define AMDGPU_GFX1101_RANGE 0x20, 0xFF
#define AMDGPU_GFX1102_RANGE 0x10, 0x20
#define AMDGPU_GFX1103_RANGE 0x01, 0xFF
#define AMDGPU_GFX1150_RANGE 0x01, 0xFF
#define AMDGPU_REMBRANDT_RANGE 0x01, 0xFF
@@ -194,7 +191,6 @@
#define ASICREV_IS_GFX1101(r) ASICREV_IS(r, GFX1101)
#define ASICREV_IS_GFX1102(r) ASICREV_IS(r, GFX1102)
#define ASICREV_IS_GFX1103(r) ASICREV_IS(r, GFX1103)
#define ASICREV_IS_GFX1150(r) ASICREV_IS(r, GFX1150)
#define ASICREV_IS_REMBRANDT(r) ASICREV_IS(r, REMBRANDT)
runtime/hsa-runtime/image/addrlib/src/core/addrlib.cpp
-1
View File
@@ -234,7 +234,6 @@ ADDR_E_RETURNCODE Lib::Create(
break;
case FAMILY_GFX1100:
case FAMILY_GFX1103:
case FAMILY_GFX1150:
pLib = Gfx11HwlInit(&client);
break;
default:
runtime/hsa-runtime/image/addrlib/src/gfx11/gfx11addrlib.cpp
-5
View File
@@ -755,11 +755,6 @@ ChipFamily Gfx11Lib::HwlConvertChipFamily(
{
}
break;
case FAMILY_GFX1150:
if (ASICREV_IS_GFX1150(chipRevision))
{
}
break;
default:
ADDR_ASSERT(!"Unknown chip family");
break;
runtime/hsa-runtime/image/blit_kernel.cpp
-6
View File
@@ -103,8 +103,6 @@ extern uint8_t ocl_blit_object_gfx1100[];
extern uint8_t ocl_blit_object_gfx1101[];
extern uint8_t ocl_blit_object_gfx1102[];
extern uint8_t ocl_blit_object_gfx1103[];
extern uint8_t ocl_blit_object_gfx1150[];
extern uint8_t ocl_blit_object_gfx1151[];
// Arguments inserted by OCL compiler, all zero here.
struct OCLHiddenArgs {
@@ -1048,10 +1046,6 @@ hsa_status_t BlitKernel::GetPatchedBlitObject(const char* agent_name,
*blit_code_object = ocl_blit_object_gfx1102;
} else if (sname == "gfx1103") {
*blit_code_object = ocl_blit_object_gfx1103;
} else if (sname == "gfx1150") {
*blit_code_object = ocl_blit_object_gfx1150;
} else if (sname == "gfx1151") {
*blit_code_object = ocl_blit_object_gfx1151;
} else {
return HSA_STATUS_ERROR_INVALID_ISA_NAME;
}
runtime/hsa-runtime/image/blit_src/CMakeLists.txt
+1 -4
View File
@@ -47,10 +47,7 @@ find_package(Clang REQUIRED HINTS ${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm
# Determine the target devices if not specified
if (NOT DEFINED TARGET_DEVICES)
set (TARGET_DEVICES "gfx700;gfx701;gfx702;gfx801;gfx802;gfx803;gfx805;gfx810"
"gfx900;gfx902;gfx904;gfx906;gfx908;gfx909;gfx90a;gfx90c;gfx940;gfx941;gfx942"
"gfx1010;gfx1011;gfx1012;gfx1013;gfx1030;gfx1031;gfx1032;gfx1033;gfx1034;gfx1035;gfx1036"
"gfx1100;gfx1101;gfx1102;gfx1103;gfx1150;gfx1151")
set(TARGET_DEVICES "gfx700;gfx701;gfx702;gfx801;gfx802;gfx803;gfx805;gfx810;gfx900;gfx902;gfx904;gfx906;gfx908;gfx909;gfx90a;gfx90c;gfx940;gfx941;gfx942;gfx1010;gfx1011;gfx1012;gfx1013;gfx1030;gfx1031;gfx1032;gfx1033;gfx1034;gfx1035;gfx1036;gfx1100;gfx1101;gfx1102;gfx1103")
endif()
set( TARGET_DEVICES ${TARGET_DEVICES} CACHE STRING "Build targets" FORCE )