Skip to content

Commit 6eaaddd

Browse files
committed
Update pal from commit 12101ea6
Update copyright to 2024 Update devdriver to v24.01.08. Add DescribeCallback for ComputeCmdBuffer Add ImageResolveSrcAsNorm flag for ResolveImageCompute Add linear for NonBCViews to pass linear 3D BCn image on vulkan cts Add new PM4 ExecuteIndirectV2 as a substitute to the ExecuteIndirect PM4 (V1) Add offset to trap handler memory base address Add SQTT EXCLUDE_NONDETAIL_SHADERDATA option for TT 3.2 and beyond Add standardized use for extern functions Add TraceConfig trace source Adding info to RGD execution marker Adjust settings targets to not trigger unconditional rebuild of all downstream sources. Archive loader: Global memory for continuations ray sorting ArchivePipeline::QueryAllocationInfo full implementation Bug fix and enhancement to GpuDebug Cleanup PAL interface changes <= 792 Clear cached GPUVA in pm4CmdBuffer::Reset Correct scratch size for color export shader Distributed compression support for displayable images Drop some asserts related to pipeline bind Dump depth/stencil view info ELF prefix change in archive loader Enable gang-submit on Linux Enable Thread Trace Marker bits on Indirect Multi PM4s as per Spec. Expose FixupQueryForNoGangedAce() to fix cts stuck Force ext32perfcntr use for secure ranges Implement automatically generating gpu hang report for Linux Implement command buffer allocation and synchronization Make CmdBuffer::CmdNop public Misc fix on crashAnalysisCmdBuffer Move GfxImage object creation to constructor. New GpuProfiler option to filter ThreadTrace dumping queue ID Now linear is valid for 3D image as 2D for gfx10 Refactor & fix SPM global timestamp counter programming Regenerate all rpm shaders with newer PalTools version Remove an unnecessary assert of EsGsLdsSize metadata Remove Navi1x macros Remove PAL gfx10 macros Replace outdated assert and comment with alert Restore static_assert Rework Pipeline Dynamic State Support Abs32Lo and Abs32Hi in archive loader Support for loading archive pipelines Fix a typo in RsrcProcMgr::InitDepthClearMetaData() Fix AMDGPU(Linux) platform Device enumeration failure if GFX9 device present Fix few Vulkan applications' hang and crash with Kernel:6.6.rc1 Fix LogExecutionMarkerInfo function Fix the incorrect calculation in ConvertColorToX9Y9Z9E5() Fix Xorg crash while running dEQP-VK.mesh_shader* on upstream stack
1 parent 6353b18 commit 6eaaddd

File tree

1,123 files changed

+45111
-70141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,123 files changed

+45111
-70141
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2017-2023 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2017-2024 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal

cmake/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2021-2023 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2021-2024 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal

cmake/Modules/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2021-2023 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2021-2024 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal

cmake/Modules/FindDRM.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2017-2023 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2017-2024 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal

cmake/Modules/FindWayland.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2017-2023 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2017-2024 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal

cmake/Modules/FindXCB.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2017-2023 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2017-2024 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal

cmake/PalBuildParameters.cmake

+1-64
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal
@@ -85,69 +85,6 @@ endif() # PAL_BUILD_GFX
8585

8686
# If the client wants Gfx9 support, them give them all the neccessary build parameters they need to fill out.
8787
if (PAL_BUILD_GFX9)
88-
pal_bp( PAL_BUILD_NAVI12 ON MODE "AUTHOR_WARNING"
89-
ASIC_CONFIG
90-
CHIP_HDR_NAVI12
91-
)
92-
93-
pal_bp( PAL_BUILD_NAVI14 ON MODE "AUTHOR_WARNING"
94-
ASIC_CONFIG
95-
CHIP_HDR_NAVI14
96-
)
97-
98-
pal_bp( PAL_BUILD_NAVI21 ON MODE "AUTHOR_WARNING"
99-
ASIC_CONFIG
100-
PAL_BUILD_GFX103
101-
PAL_BUILD_GFX10_3
102-
PAL_BUILD_NAVI2X
103-
CHIP_HDR_NAVI21
104-
)
105-
106-
pal_bp( PAL_BUILD_NAVI22 ON MODE "AUTHOR_WARNING"
107-
ASIC_CONFIG
108-
PAL_BUILD_GFX103
109-
PAL_BUILD_GFX10_3
110-
PAL_BUILD_NAVI2X
111-
CHIP_HDR_NAVI22
112-
)
113-
114-
pal_bp( PAL_BUILD_NAVI23 ON MODE "AUTHOR_WARNING"
115-
ASIC_CONFIG
116-
PAL_BUILD_GFX103
117-
PAL_BUILD_GFX10_3
118-
PAL_BUILD_NAVI2X
119-
CHIP_HDR_NAVI23
120-
)
121-
122-
pal_bp( PAL_BUILD_NAVI24 ON MODE "AUTHOR_WARNING"
123-
ASIC_CONFIG
124-
PAL_BUILD_GFX103
125-
PAL_BUILD_GFX10_3
126-
PAL_BUILD_NAVI2X
127-
CHIP_HDR_NAVI24
128-
)
129-
130-
pal_bp( PAL_BUILD_REMBRANDT ON MODE "AUTHOR_WARNING"
131-
ASIC_CONFIG
132-
PAL_BUILD_GFX103
133-
PAL_BUILD_GFX10_3
134-
CHIP_HDR_REMBRANDT
135-
)
136-
137-
pal_bp( PAL_BUILD_MENDOCINO ON MODE "AUTHOR_WARNING"
138-
ASIC_CONFIG
139-
PAL_BUILD_GFX103
140-
PAL_BUILD_GFX10_3
141-
PAL_BUILD_RAPHAEL
142-
CHIP_HDR_RAPHAEL
143-
)
144-
145-
pal_bp( PAL_BUILD_RAPHAEL ON MODE "AUTHOR_WARNING"
146-
ASIC_CONFIG
147-
PAL_BUILD_GFX103
148-
PAL_BUILD_GFX10_3
149-
CHIP_HDR_RAPHAEL
150-
)
15188

15289
#if PAL_BUILD_NAVI31
15390
pal_bp( PAL_BUILD_NAVI31 ON MODE "AUTHOR_WARNING"

cmake/PalCodegen.cmake

+20-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2022-2023 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2022-2024 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal
@@ -155,19 +155,24 @@ function(target_pal_settings TARGET)
155155
endif()
156156

157157
convert_pal_settings_name(${SETTINGS_FILE} SETTING_TGT FALSE)
158-
add_custom_target(${SETTING_TGT}
158+
add_custom_command(
159+
OUTPUT ${SETGEN_OUT_DIR}/${OUT_BASENAME}.cpp
160+
${SETGEN_OUT_DIR}/${OUT_BASENAME}.h
159161
COMMAND ${Python3_EXECUTABLE} ${PAL_GEN_DIR}/genSettingsCode.py
160162
--settingsFile ${SETTINGS_FILE}
161163
--outFilename ${OUT_BASENAME}
162164
${ADDL_ARGS}
163165
COMMENT "Generating settings from ${SETTINGS_FILE}..."
164166
DEPENDS ${SETTINGS_FILE}
165167
${ADDL_DEPS}
166-
BYPRODUCTS ${SETGEN_OUT_DIR}/${OUT_BASENAME}.cpp
167-
${SETGEN_OUT_DIR}/${OUT_BASENAME}.h
168+
)
169+
add_custom_target(${SETTING_TGT}
170+
DEPENDS ${SETGEN_OUT_DIR}/${OUT_BASENAME}.cpp
171+
${SETGEN_OUT_DIR}/${OUT_BASENAME}.h
168172
SOURCES ${SETGEN_OUT_DIR}/${OUT_BASENAME}.cpp
169173
${SETGEN_OUT_DIR}/${OUT_BASENAME}.h
170174
)
175+
171176
add_dependencies(${TARGET} ${SETTING_TGT})
172177
set_target_properties(${SETTING_TGT}
173178
PROPERTIES
@@ -245,6 +250,8 @@ function(pal_gen_settings)
245250
list(APPEND CODEGEN_OPTIONAL_ARGS "--classname" "${SETTINGS_CLASS_NAME}")
246251
endif()
247252

253+
list(APPEND CODEGEN_OPTIONAL_ARGS "--is-pal-settings")
254+
248255
if ((NOT EXISTS ${SETTINGS_OUT_DIR}/${GENERATED_HEADER_FILENAME}) OR
249256
(NOT EXISTS ${SETTINGS_OUT_DIR}/${GENERATED_SOURCE_FILENAME}))
250257
# Generate these during configuration so that they are guaranteed to exist.
@@ -255,13 +262,16 @@ function(pal_gen_settings)
255262
--settings-filename ${SETTINGS_HEADER_FILE}
256263
--outdir ${SETTINGS_OUT_DIR}
257264
--namespaces ${SETTINGS_NAMESPACES}
265+
--include-headers ${SETTINGS_INCLUDE_HEADERS}
258266
${CODEGEN_OPTIONAL_ARGS}
259267
COMMAND_ECHO STDOUT
260268
)
261269
endif()
262270

263271
convert_pal_settings_name(${SETTINGS_INPUT_JSON} SETTING_TGT FALSE)
264-
add_custom_target(${SETTING_TGT}
272+
add_custom_command(
273+
OUTPUT ${SETTINGS_OUT_DIR}/${GENERATED_HEADER_FILENAME}
274+
${SETTINGS_OUT_DIR}/${GENERATED_SOURCE_FILENAME}
265275
COMMAND ${Python3_EXECUTABLE} ${DEVDRIVER_PATH}/apis/settings/codegen/settings_codegen.py
266276
--input ${PAL_SOURCE_DIR}/${SETTINGS_INPUT_JSON}
267277
--generated-filename ${SETTINGS_GENERATED_FILENAME}
@@ -270,14 +280,16 @@ function(pal_gen_settings)
270280
--namespaces ${SETTINGS_NAMESPACES}
271281
--include-headers ${SETTINGS_INCLUDE_HEADERS}
272282
${CODEGEN_OPTIONAL_ARGS}
273-
COMMENT "Generating settings from ${SETTINGS_FILE}..."
283+
COMMENT "Generating settings from ${PAL_SOURCE_DIR}/${SETTINGS_INPUT_JSON}..."
274284
DEPENDS ${PAL_SOURCE_DIR}/${SETTINGS_INPUT_JSON}
275285
${DEVDRIVER_PATH}/apis/settings/codegen/settings_codegen.py
276286
${DEVDRIVER_PATH}/apis/settings/codegen/settings_schema.yaml
277287
${DEVDRIVER_PATH}/apis/settings/codegen/settings.cpp.jinja2
278288
${DEVDRIVER_PATH}/apis/settings/codegen/settings.h.jinja2
279-
BYPRODUCTS ${SETTINGS_OUT_DIR}/${GENERATED_HEADER_FILENAME}
280-
${SETTINGS_OUT_DIR}/${GENERATED_SOURCE_FILENAME}
289+
)
290+
add_custom_target(${SETTING_TGT}
291+
DEPENDS ${SETTINGS_OUT_DIR}/${GENERATED_HEADER_FILENAME}
292+
${SETTINGS_OUT_DIR}/${GENERATED_SOURCE_FILENAME}
281293
SOURCES ${SETTINGS_OUT_DIR}/${GENERATED_HEADER_FILENAME}
282294
${SETTINGS_OUT_DIR}/${GENERATED_SOURCE_FILENAME}
283295
)

cmake/PalCompileDefinitions.cmake

+23-33
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal
@@ -46,43 +46,33 @@ function(pal_compile_definitions_gpu TARGET)
4646

4747
# PAL GFXx BUILD Defines
4848
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_GFX9=$<BOOL:${PAL_BUILD_GFX9}>)
49-
target_compile_definitions(${TARGET} INTERFACE PAL_BUILD_GFX10=$<BOOL:${PAL_BUILD_GFX10}>)
50-
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_GFX103=$<BOOL:${PAL_BUILD_GFX103}>)
5149
#if PAL_BUILD_GFX11
5250
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_GFX11=$<BOOL:${PAL_BUILD_GFX11}>)
5351
#endif
5452

55-
# PAL ASIC BUILD Defines
56-
57-
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_NAVI12=$<BOOL:${PAL_BUILD_NAVI12}>)
58-
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_NAVI12=$<BOOL:${CHIP_HDR_NAVI12}>)
59-
60-
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_NAVI14=$<BOOL:${PAL_BUILD_NAVI14}>)
61-
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_NAVI14=$<BOOL:${CHIP_HDR_NAVI14}>)
62-
63-
# Define for ASIC Family and is not associated with a CHIP_HDR
64-
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_NAVI2X=$<BOOL:${PAL_BUILD_NAVI2X}>)
65-
66-
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_NAVI21=$<BOOL:${PAL_BUILD_NAVI21}>)
67-
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_NAVI21=$<BOOL:${CHIP_HDR_NAVI21}>)
53+
# PAL no longer references these defines and our clients must remove their references when upgrading.
54+
if (PAL_CLIENT_INTERFACE_MAJOR_VERSION LESS 845)
55+
target_compile_definitions(${TARGET} INTERFACE PAL_BUILD_GFX10=$<BOOL:${PAL_BUILD_GFX9}>)
56+
target_compile_definitions(${TARGET} INTERFACE PAL_BUILD_GFX103=$<BOOL:${PAL_BUILD_GFX9}>)
57+
target_compile_definitions(${TARGET} INTERFACE PAL_BUILD_NAVI12=$<BOOL:${PAL_BUILD_GFX9}>)
58+
target_compile_definitions(${TARGET} INTERFACE PAL_BUILD_NAVI14=$<BOOL:${PAL_BUILD_GFX9}>)
59+
target_compile_definitions(${TARGET} INTERFACE PAL_BUILD_NAVI2X=$<BOOL:${PAL_BUILD_GFX9}>)
60+
target_compile_definitions(${TARGET} INTERFACE PAL_BUILD_NAVI21=$<BOOL:${PAL_BUILD_GFX9}>)
61+
target_compile_definitions(${TARGET} INTERFACE PAL_BUILD_NAVI22=$<BOOL:${PAL_BUILD_GFX9}>)
62+
target_compile_definitions(${TARGET} INTERFACE PAL_BUILD_NAVI23=$<BOOL:${PAL_BUILD_GFX9}>)
63+
target_compile_definitions(${TARGET} INTERFACE PAL_BUILD_NAVI24=$<BOOL:${PAL_BUILD_GFX9}>)
64+
target_compile_definitions(${TARGET} INTERFACE PAL_BUILD_REMBRANDT=$<BOOL:${PAL_BUILD_GFX9}>)
65+
target_compile_definitions(${TARGET} INTERFACE PAL_BUILD_RAPHAEL=$<BOOL:${PAL_BUILD_GFX9}>)
66+
target_compile_definitions(${TARGET} INTERFACE PAL_BUILD_MENDOCINO=$<BOOL:${PAL_BUILD_GFX9}>)
67+
endif()
6868

69-
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_NAVI22=$<BOOL:${PAL_BUILD_NAVI22}>)
70-
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_NAVI22=$<BOOL:${CHIP_HDR_NAVI22}>)
71-
72-
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_NAVI23=$<BOOL:${PAL_BUILD_NAVI23}>)
73-
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_NAVI23=$<BOOL:${CHIP_HDR_NAVI23}>)
74-
75-
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_NAVI24=$<BOOL:${PAL_BUILD_NAVI24}>)
76-
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_NAVI24=$<BOOL:${CHIP_HDR_NAVI24}>)
77-
78-
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_REMBRANDT=$<BOOL:${PAL_BUILD_REMBRANDT}>)
79-
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_REMBRANDT=$<BOOL:${CHIP_HDR_REMBRANDT}>)
80-
81-
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_RAPHAEL=$<BOOL:${PAL_BUILD_RAPHAEL}>)
82-
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_RAPHAEL=$<BOOL:${CHIP_HDR_RAPHAEL}>)
83-
84-
# MENDOCINO inherits from CHIP_HDR_RAPHAEL
85-
target_compile_definitions(${TARGET} PUBLIC PAL_BUILD_MENDOCINO=$<BOOL:${PAL_BUILD_MENDOCINO}>)
69+
# PAL ASIC BUILD Defines
70+
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_NAVI21=$<BOOL:${PAL_BUILD_GFX9}>)
71+
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_NAVI22=$<BOOL:${PAL_BUILD_GFX9}>)
72+
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_NAVI23=$<BOOL:${PAL_BUILD_GFX9}>)
73+
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_NAVI24=$<BOOL:${PAL_BUILD_GFX9}>)
74+
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_REMBRANDT=$<BOOL:${PAL_BUILD_GFX9}>)
75+
target_compile_definitions(${TARGET} PRIVATE CHIP_HDR_RAPHAEL=$<BOOL:${PAL_BUILD_GFX9}>)
8676

8777
#if PAL_BUILD_NAVI3X
8878
# Define for ASIC Family and is not associated with a CHIP_HDR

cmake/PalCompilerOptions.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal
@@ -95,7 +95,7 @@ function(pal_compiler_options TARGET)
9595

9696
# The MacOS linker does not have --build-id. That is OK because we do not support building
9797
# a driver on MacOS; it is only used for experimental building of standalone tools.
98-
if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
98+
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
9999
target_link_options(${TARGET} PUBLIC "LINKER:--build-id")
100100
endif()
101101
else()

cmake/PalCompilerWarnings.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal

cmake/PalOptions.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal

cmake/PalOverrides.cmake

+11-19
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal
@@ -30,26 +30,18 @@ include_guard()
3030
# GPU Overrides
3131

3232
if(PAL_BUILD_GFX9)
33-
3433
set(ADDR_GFX10_BUILD ON)
3534

36-
set(ADDR_NAVI12_BUILD ${PAL_BUILD_NAVI12})
37-
38-
set(ADDR_NAVI14_BUILD ${PAL_BUILD_NAVI14})
39-
40-
set(ADDR_NAVI21_BUILD ${PAL_BUILD_NAVI21})
41-
42-
set(ADDR_NAVI22_BUILD ${PAL_BUILD_NAVI22})
43-
44-
set(ADDR_NAVI23_BUILD ${PAL_BUILD_NAVI23})
45-
46-
set(ADDR_NAVI24_BUILD ${PAL_BUILD_NAVI24})
47-
48-
set(ADDR_REMBRANDT_BUILD ${PAL_BUILD_REMBRANDT})
49-
50-
set(ADDR_RAPHAEL_BUILD ${PAL_BUILD_RAPHAEL})
51-
52-
set(ADDR_MENDOCINO_BUILD ${PAL_BUILD_MENDOCINO})
35+
# These ASICs don't have build macros, they're always present if this HWL is enabled.
36+
set(ADDR_NAVI12_BUILD ON)
37+
set(ADDR_NAVI14_BUILD ON)
38+
set(ADDR_NAVI21_BUILD ON)
39+
set(ADDR_NAVI22_BUILD ON)
40+
set(ADDR_NAVI23_BUILD ON)
41+
set(ADDR_NAVI24_BUILD ON)
42+
set(ADDR_REMBRANDT_BUILD ON)
43+
set(ADDR_RAPHAEL_BUILD ON)
44+
set(ADDR_MENDOCINO_BUILD ON)
5345

5446
#if PAL_BUILD_GFX11
5547
set(ADDR_GFX11_BUILD ${PAL_BUILD_GFX11})

cmake/PalVersionHelper.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
#######################################################################################################################
33
#
4-
# Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All Rights Reserved.
4+
# Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All Rights Reserved.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)