Skip to content

merge aomp-dev into amd-staging #2392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
z1-cciauto wants to merge 2 commits into from
Closed

merge aomp-dev into amd-staging #2392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7489641
[test] Add gfx1250/gfx1251 support and strip xnack target features
saiislam Aug 3, 2026
2568e4d
merge aomp-dev into amd-staging
z1-cciauto Aug 4, 2026
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
16 changes: 15 additions & 1 deletion test/Makefile.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ else
gfx1010, gfx1010:xnack+\
gfx1011, gfx1011:xnack+\
gfx1012, gfx1012:xnack+\
gfx1013, gfx1013:xnack+
gfx1013, gfx1013:xnack+\
gfx1250,\
gfx1251
endif


Expand Down Expand Up @@ -276,6 +278,18 @@ ifeq ($(AOMP_SANITIZER),1)
ASAN_UNSUPPORTED = ASAN_COMPILE ASAN_RUNTIME
endif

# gfx1250 and gfx1251 always operate with xnack enabled and the compiler
# rejects an explicit xnack target feature (e.g. :xnack+) on these
# architectures. Drop any requested xnack feature so tests that hard-code
# AOMP_TARGET_FEATURES still build and run. All other architectures keep the
# existing behavior.
ifneq (,$(findstring gfx1250,$(AOMP_GPU)))
AOMP_TARGET_FEATURES := $(subst :xnack-,,$(subst :xnack+,,$(AOMP_TARGET_FEATURES)))
endif
ifneq (,$(findstring gfx1251,$(AOMP_GPU)))
AOMP_TARGET_FEATURES := $(subst :xnack-,,$(subst :xnack+,,$(AOMP_TARGET_FEATURES)))
endif

ifeq ($(AOMP_TARGET_FEATURES),)
GPU_W_FEATURES = $(AOMP_GPU)
else
Expand Down
13 changes: 13 additions & 0 deletions test/smoke/Makefile.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,19 @@ prerequisites:
@echo ">>> $(SCRIPT_INIT) >>>"
endif

# gfx1250 and gfx1251 always operate with xnack enabled and the compiler
# rejects an explicit xnack target feature (e.g. :xnack+) on these
# architectures. Individual tests set AOMP_TARGET_FEATURES after including
# Makefile.defs, so strip any requested xnack feature here (Makefile.rules is
# included last) to keep it off the compile line and out of the SUPPORTED
# matching. All other architectures keep the existing behavior.
ifneq (,$(findstring gfx1250,$(AOMP_GPU)))
AOMP_TARGET_FEATURES := $(subst :xnack-,,$(subst :xnack+,,$(AOMP_TARGET_FEATURES)))
endif
ifneq (,$(findstring gfx1251,$(AOMP_GPU)))
AOMP_TARGET_FEATURES := $(subst :xnack-,,$(subst :xnack+,,$(AOMP_TARGET_FEATURES)))
endif

# ----- If SUPPORTED is empty then it means that there is no
# restriction for the test and the test can be compiled and run
# on the current GPU architecture.
Expand Down