Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Add basic Navi44 support #109

Open
wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

Add basic Navi44 support #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
950fc29
feat: add basic navi44 support
LloydNicholson Jul 30, 2025
fbd9e6b
rpm compute binaries for navi44
LloydNicholson Jul 30, 2025
3926b05
fix: remove comments
LloydNicholson Jul 30, 2025
8ba2f2a
missed changes for navi44
LloydNicholson Jul 30, 2025
bb3eefa
fix: mispelled var
LloydNicholson Jul 30, 2025
dfb29a5
fix: add basic navi44 support
LloydNicholson Jul 31, 2025
c3dedd7
fix: touchups
LloydNicholson Jul 31, 2025
d1b80c4
fix: missed cmake vars
LloydNicholson Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion cmake/PalBuildParameters.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,19 @@ pal_client_bp(PAL_BUILD_GFX ON
PAL_BUILD_GFX
)

#if PAL_BUILD_NAVI44
pal_client_bp(PAL_BUILD_NAVI44 ON
DEPENDS_ON
PAL_BUILD_GFX12
)
#endif

#if PAL_BUILD_NAVI48
pal_client_bp(PAL_BUILD_NAVI48 ON
DEPENDS_ON
PAL_BUILD_GFX12
)
#endif
#endif

#####################################################################################

Expand Down
5 changes: 5 additions & 0 deletions cmake/PalCompileDefinitions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ function(pal_compile_definitions_gpu TARGET)
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_NAVI48=$<BOOL:${PAL_BUILD_NAVI48}>)
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_NAVI48=$<BOOL:${CHIP_HDR_NAVI48}>)
#endif

#if PAL_BUILD_NAVI44
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_NAVI44=$<BOOL:${PAL_BUILD_NAVI44}>)
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_NAVI44=$<BOOL:${CHIP_HDR_NAVI44}>)
#endif
#endif

endif()
Expand Down
6 changes: 6 additions & 0 deletions cmake/PalOverrides.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ if(PAL_BUILD_GFX12)
set(PAL_SWD_BUILD_NAVI48 ${PAL_BUILD_NAVI48})
#endif

#if PAL_BUILD_NAVI44
pal_set_or(ADDR_GFX12_BUILD ${PAL_BUILD_NAVI44})
pal_set_or(PAL_SWD_BUILD_NAVI4X ${PAL_BUILD_NAVI44})
set(PAL_SWD_BUILD_NAVI44 ${PAL_BUILD_NAVI44})
#endif

endif() # PAL_BUILD_GFX12
#endif

6 changes: 6 additions & 0 deletions inc/core/palLib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ enum class NullGpuId : uint32
#if PAL_BUILD_NAVI48
Navi48, ///< 12.0.1
#endif
#if PAL_BUILD_NAVI44
Navi44, ///< 12.0.0
#endif
#endif
#if (PAL_CLIENT_INTERFACE_MAJOR_VERSION>= 888)
#endif
Expand Down Expand Up @@ -215,6 +218,9 @@ enum class AsicRevision : uint32
#if PAL_BUILD_STRIX_HALO
StrixHalo = 0x3C, ///< 11.5.1
#endif
#if PAL_BUILD_NAVI44
Navi44 = 0x3D, ///< 12.0.0
#endif
#if PAL_BUILD_NAVI48
Navi48 = 0x3E, ///< 12.0.1
#endif
Expand Down
8 changes: 8 additions & 0 deletions inc/core/palPipelineAbi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ enum class AmdGpuMachineType : uint8
#if PAL_BUILD_STRIX_HALO
Gfx1151 = 0x4A, ///< EF_AMDGPU_MACH_AMDGCN_GFX1151
#endif
#if PAL_BUILD_NAVI44
Gfx1200 = 0x4D, ///< IDK
#endif
#if PAL_BUILD_NAVI48
Gfx1201 = 0x4E, ///< EF_AMDGPU_MACH_AMDGCN_GFX1200
#endif
Expand Down Expand Up @@ -181,6 +184,10 @@ enum GfxIpStepping : uint16
GfxIpSteppingStrixHalo = 1,
#endif

#if PAL_BUILD_NAVI44
GfxIpSteppingNavi44 = 0,
#endif

#if PAL_BUILD_NAVI48
GfxIpSteppingNavi48 = 1,
#endif
Expand Down Expand Up @@ -865,3 +872,4 @@ enum class ZOrder : uint8

} //PalAbi
} //Pal

2 changes: 1 addition & 1 deletion inc/core/palPipelineAbiUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,4 +597,4 @@ inline Result DeserializeCodeObjectMetadata(
}

} //Abi
} //Pal
} //Pal
100 changes: 100 additions & 0 deletions inc/gpuUtil/mlaa/g_mlaaComputePipelineBinaries.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8479,6 +8479,97 @@ inline constexpr Util::uint8 MlaaFindSepEdge_Cs_4AC1E1C2[] =
};
#endif

#if (PAL_BUILD_GFX12&& 0) || (PAL_BUILD_GFX12&& PAL_BUILD_NAVI44) || (PAL_BUILD_GFX12&& (PAL_BUILD_NAVI44&& 0)) || (PAL_BUILD_GFX12&& (0 && 0))
// Mlaa Calc Sep Edge Length compute shader binary for Navi 44
inline constexpr Util::uint8 MlaaCalcSepSomething[] =
{
0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x0b, 0x00, 0x08, 0x00,
0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00,
0x01, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00,
0x47, 0x4c, 0x53, 0x4c, 0x2e, 0x73, 0x74, 0x64, 0x2e, 0x34, 0x35, 0x30,
0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x06, 0x00, 0x05, 0x00, 0x00, 0x00,
0x04, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x00, 0x00, 0x00,
0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x00,
0x11, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00,
0xc2, 0x01, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00,
0x6d, 0x61, 0x69, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x00,
0x08, 0x00, 0x00, 0x00, 0x69, 0x64, 0x78, 0x00, 0x05, 0x00, 0x08, 0x00,
0x0b, 0x00, 0x00, 0x00, 0x67, 0x6c, 0x5f, 0x47, 0x6c, 0x6f, 0x62, 0x61,
0x6c, 0x49, 0x6e, 0x76, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49,
0x44, 0x00, 0x00, 0x00, 0x05, 0x00, 0x05, 0x00, 0x11, 0x00, 0x00, 0x00,
0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x44, 0x61, 0x74, 0x61, 0x00, 0x00,
0x06, 0x00, 0x06, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x44, 0x61, 0x74, 0x61, 0x00, 0x00,
0x05, 0x00, 0x03, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x05, 0x00, 0x18, 0x00, 0x00, 0x00, 0x49, 0x6e, 0x70, 0x75,
0x74, 0x44, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x06, 0x00, 0x06, 0x00,
0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x69, 0x6e, 0x70, 0x75,
0x74, 0x44, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x00,
0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00,
0x0b, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
0x47, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
0x04, 0x00, 0x00, 0x00, 0x48, 0x00, 0x05, 0x00, 0x11, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x47, 0x00, 0x03, 0x00, 0x11, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
0x47, 0x00, 0x04, 0x00, 0x13, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00, 0x13, 0x00, 0x00, 0x00,
0x21, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00,
0x17, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
0x48, 0x00, 0x05, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x03, 0x00,
0x18, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00,
0x1a, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x47, 0x00, 0x04, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00,
0x21, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
0x15, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, 0x07, 0x00, 0x00, 0x00,
0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x17, 0x00, 0x04, 0x00,
0x09, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
0x20, 0x00, 0x04, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
0x09, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00, 0x0a, 0x00, 0x00, 0x00,
0x0b, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x04, 0x00,
0x06, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x20, 0x00, 0x04, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x03, 0x00, 0x10, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x03, 0x00, 0x11, 0x00, 0x00, 0x00,
0x10, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, 0x12, 0x00, 0x00, 0x00,
0x02, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00,
0x12, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
0x15, 0x00, 0x04, 0x00, 0x14, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
0x01, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x04, 0x00, 0x14, 0x00, 0x00, 0x00,
0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x03, 0x00,
0x17, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x03, 0x00,
0x18, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00,
0x19, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
0x3b, 0x00, 0x04, 0x00, 0x19, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00,
0x02, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, 0x1c, 0x00, 0x00, 0x00,
0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x04, 0x00,
0x06, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
0x36, 0x00, 0x05, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x02, 0x00,
0x05, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00, 0x07, 0x00, 0x00, 0x00,
0x08, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x41, 0x00, 0x05, 0x00,
0x0d, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
0x0c, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00, 0x00,
0x0f, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x03, 0x00,
0x08, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x04, 0x00,
0x06, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
0x3d, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00,
0x08, 0x00, 0x00, 0x00, 0x41, 0x00, 0x06, 0x00, 0x1c, 0x00, 0x00, 0x00,
0x1d, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00,
0x1b, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00, 0x00,
0x1e, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x84, 0x00, 0x05, 0x00,
0x06, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00,
0x1f, 0x00, 0x00, 0x00, 0x41, 0x00, 0x06, 0x00, 0x1c, 0x00, 0x00, 0x00,
0x21, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00,
0x16, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x03, 0x00, 0x21, 0x00, 0x00, 0x00,
0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x01, 0x00, 0x38, 0x00, 0x01, 0x00
};
#endif

// Table of compute pipeline binaries for 10_1_0
inline constexpr PipelineBinary mlaaComputeBinaryTable10_1_0[] =
{
Expand Down Expand Up @@ -8571,5 +8662,14 @@ inline constexpr PipelineBinary mlaaComputeBinaryTable12_0_1[] =
};
#endif

#if PAL_BUILD_GFX12 && PAL_BUILD_NAVI44
// Table of compute pipeline binaries for 12_1_1
inline constexpr PipelineBinary mlaaComputeBinaryTable12_0_0[] =
{
// TODO: not sure what this should be called and even where the name is generated??
{MlaaCalcSepSomething, sizeof(MlaaCalcSepSomething)},
};
#endif

} // Mlaa
} // GpuUtil
6 changes: 6 additions & 0 deletions inc/gpuUtil/mlaa/g_mlaaComputePipelineInitImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,12 @@ Pal::Result CreateMlaaComputePipelines(
break;
#endif

#if PAL_BUILD_GFX12 && PAL_BUILD_NAVI44
case Pal::IpTriple({ 12, 0, 0 }):
pTable = mlaaComputeBinaryTable12_0_0;
break;
#endif

#if PAL_BUILD_GFX12 && PAL_BUILD_NAVI48
case Pal::IpTriple({ 12, 0, 1 }):
pTable = mlaaComputeBinaryTable12_0_1;
Expand Down
2 changes: 0 additions & 2 deletions shared/devdriver/third_party/rapidjson/include/rapidjson/document.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,6 @@ struct GenericStringRef {

GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}

GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }

//! implicit conversion to plain CharType pointer
operator const Ch *() const { return s; }

Expand Down
7 changes: 7 additions & 0 deletions src/core/device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2425,6 +2425,13 @@ inline bool IsNavi48(const Device& device)
return AMDGPU_IS_NAVI48(device.ChipProperties().familyId, device.ChipProperties().eRevId);
}
#endif

#if PAL_BUILD_NAVI44
inline bool IsNavi44(const Device& device)
{
return AMDGPU_IS_NAVI44(device.ChipProperties().familyId, device.ChipProperties().eRevId);
}
#endif
#endif

constexpr bool IsGfx10(GfxIpLevel gfxLevel)
Expand Down
26 changes: 26 additions & 0 deletions src/core/hw/amdgpu_asic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,13 @@
#define AMDGPU_STRIX_HALO_RANGE 0xC0, 0xFF // 192 <= x < 255 (tentative)
#endif

// Gfx12
#if PAL_BUILD_NAVI48
#define AMDGPU_NAVI48_RANGE 0x50, 0xff
#endif
#if PAL_BUILD_NAVI44
#define AMDGPU_NAVI44_RANGE 0x01, 0x50 // 1 <= x < 80
#endif

#define AMDGPU_EXPAND_FIX(x) x
#define AMDGPU_RANGE_HELPER(val, min, max) ((val >= min) && (val < max))
Expand Down Expand Up @@ -148,6 +152,10 @@
#define ASICREV_IS_NAVI48(r) ASICREV_IS(r, NAVI48)
#endif

#if PAL_BUILD_NAVI44
#define ASICREV_IS_NAVI44(r) ASICREV_IS(r, NAVI44)
#endif

// AMDGPU_IS(familyId, eRevisionId, familyName, revisionName)
#define AMDGPU_IS(f, r, fn, rn) (FAMILY_IS(f, fn) && ASICREV_IS(r, rn))

Expand Down Expand Up @@ -184,9 +192,13 @@
#define AMDGPU_IS_STRIX_HALO(f,r) AMDGPU_IS(f, r, STX, STRIX_HALO)
#endif

// Gfx12
#if PAL_BUILD_NAVI48
#define AMDGPU_IS_NAVI48(f, r) AMDGPU_IS(f, r, NV4, NAVI48)
#endif
#if PAL_BUILD_NAVI44
#define AMDGPU_IS_NAVI44(f, r) AMDGPU_IS(f, r, NV4, NAVI44)
#endif

// Device IDs
// Gfx10.1
Expand Down Expand Up @@ -224,6 +236,10 @@
#define DEVICE_ID_NAVI48_94 0x94
#endif

#if PAL_BUILD_NAVI44
#define DEVICE_ID_NAVI44_7590 0x7590
#endif

// DEVICE_IS(deviceId, deviceName)
#define DEVICE_IS(d, dn) (d == DEVICE_ID_##dn)

Expand Down Expand Up @@ -259,6 +275,11 @@
#define STRIX_HALO_P 0xC0
#endif

// Gfx12
#if PAL_BUILD_NAVI44
#define NAVI44_P 0x50
#endif

#if PAL_BUILD_NAVI48
#define NAVI48_P 0x51
#endif
Expand Down Expand Up @@ -330,10 +351,15 @@
#define PRID_STX_STRIX_HALO_00 0x00
#endif

// Gfx12
#if PAL_BUILD_NAVI48
#define PRID_NV_NAVI48_00 0x00
#endif

#if PAL_BUILD_NAVI44
#define PRID_NV_NAVI44_00 0x00
#endif

// VARIANT_IS(prid, variantName)
#define VARIANT_IS(v, vn) (v == PRID_##vn)

Expand Down
2 changes: 1 addition & 1 deletion src/core/hw/gfxip/gfx12/chip/gfx12_merged_enum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9269,7 +9269,7 @@ enum PerfCtrId
MaxPerfCtrId = 40,
};

#if CHIP_HDR_NAVI48
#if CHIP_HDR_NAVI48 || CHIP_HDR_NAVI44
constexpr unsigned int Nv48MaxPerfEventIds[MaxPerfCtrId] =
{
CB_PERF_SEL_EXPORT_KILLED_BY_NULL_TARGET_SHADER_MASK,
Expand Down
28 changes: 28 additions & 0 deletions src/core/hw/gfxip/gfx12/gfx12Device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,34 @@ void InitializeGpuChipProperties(
pInfo->gfxip.mallSizeInBytes = 64_MiB;

pInfo->gfxip.tccSizeInBytes = 8_MiB; // gl2c_total_cache_size_KB
}
#endif
#if PAL_BUILD_NAVI44
if (AMDGPU_IS_NAVI44(pInfo->familyId, pInfo->eRevId))
{
uint32 stepping = Abi::GfxIpSteppingNavi44;

pInfo->gfx9.rbPlus = 1;

pInfo->gpuType = GpuType::Discrete;
pInfo->revision = AsicRevision::Navi44;
pInfo->gfxStepping = stepping;
pInfo->gfxTriple.stepping = stepping;
pInfo->gfx9.numShaderEngines = 2;
pInfo->gfx9.numSdpInterfaces = 32;
pInfo->gfx9.maxNumCuPerSh = 16;
pInfo->gfx9.maxNumRbPerSe = 4;

// The GL2C is the TCC
pInfo->gfx9.gfx10.numGl2a = 2;
pInfo->gfx9.gfx10.numGl2c = 16;
pInfo->gfx9.numTccBlocks = pInfo->gfx9.gfx10.numGl2c;

pInfo->gfx9.gfx10.numWgpAboveSpi = 2;
pInfo->gfx9.gfx10.numWgpBelowSpi = 0;

pInfo->gfxip.mallSizeInBytes = 32_MiB;
pInfo->gfxip.tccSizeInBytes = 4_MiB;
}
else
#endif
Expand Down
5 changes: 5 additions & 0 deletions src/core/hw/gfxip/gfx12/gfx12PerfCtrInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,11 @@ static const MaxEventIds& GetEventLimits(
case Pal::AsicRevision::Navi48:
pOut = &Nv48MaxPerfEventIds;
break;
#endif
#if PAL_BUILD_NAVI44
case Pal::AsicRevision::Navi44:
pOut = &Nv48MaxPerfEventIds;
break;
#endif
default:
PAL_ASSERT_ALWAYS(); // What chip is this?
Expand Down
2 changes: 1 addition & 1 deletion src/core/hw/gfxip/pipeline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ static Util::Abi::ApiShaderType PalShaderTypeToAbiShaderType(ShaderType stage)
inline bool PipelineSupportsGenericEntryPoint(
const Util::PalAbi::CodeObjectMetadata& metadata)
{
return Util::PalAbi::PalMetadataVersionAtLeast(metadata, 3, 6);
return PalMetadataVersionAtLeast(metadata, 3, 6);
}

constexpr uint32 MaxGfxShaderLibraryCount = 3;
Expand Down
Loading