Skip to content

Commit 3e158bf

Browse files
committed
[smoke] Replace deprecated -fopenmp-target-ignore-env-vars flag
Update 27 tests (19 smoke, 8 smoke-limbo) to use replacement flags for specialized kernel generation. The -fopenmp-target-ignore-env-vars flag is removed from ROCm/llvm-project (PR #1698) as it had no codegen implementation and represented a deprecated approach. Replaced with -fopenmp-assume-teams-oversubscription and -fopenmp-assume-threads-oversubscription, which provide equivalent functionality by indicating that the runtime can ignore environment variables for thread/team configuration, enabling no-loop and xteam-reduction kernel optimizations.
1 parent 5a1b93b commit 3e158bf

File tree

27 files changed

+27
-27
lines changed

27 files changed

+27
-27
lines changed

test/smoke-limbo/no-loop-1/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUNENV += LIBOMPTARGET_KERNEL_TRACE=1
88

99
RUNCMD = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
1010

11-
CFLAGS += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
11+
CFLAGS += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
1212
CLANG = clang
1313
OMP_BIN = $(AOMP)/bin/$(CLANG)
1414
CC = $(OMP_BIN) $(VERBOSE)

test/smoke-limbo/no-loop-4/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUNENV += LIBOMPTARGET_KERNEL_TRACE=1
88

99
RUNCMD = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
1010

11-
CFLAGS += -fopenmp-target-fast -fno-openmp-target-ignore-env-vars
11+
CFLAGS += -fopenmp-target-fast
1212
CLANG = clang
1313
OMP_BIN = $(AOMP)/bin/$(CLANG)
1414
CC = $(OMP_BIN) $(VERBOSE)

test/smoke-limbo/no-loop-7/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUNENV += LIBOMPTARGET_KERNEL_TRACE=1
88

99
RUNCMD = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
1010

11-
CFLAGS += -O3 -fno-openmp-target-ignore-env-vars -fopenmp-target-fast
11+
CFLAGS += -O3 -fopenmp-target-fast
1212
CLANG = clang
1313
OMP_BIN = $(AOMP)/bin/$(CLANG)
1414
CC = $(OMP_BIN) $(VERBOSE)

test/smoke-limbo/no-loop-threads/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUNENV += LIBOMPTARGET_KERNEL_TRACE=1
88

99
RUNCMD = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
1010

11-
CFLAGS += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
11+
CFLAGS += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
1212
CLANG = clang
1313
OMP_BIN = $(AOMP)/bin/$(CLANG)
1414
CC = $(OMP_BIN) $(VERBOSE)

test/smoke-limbo/opt-kernel-global-iv/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUNENV += LIBOMPTARGET_KERNEL_TRACE=1
88

99
RUNCMD = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
1010

11-
CFLAGS += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
11+
CFLAGS += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
1212
CLANG = clang
1313
OMP_BIN = $(AOMP)/bin/$(CLANG)
1414
CC = $(OMP_BIN) $(VERBOSE)

test/smoke-limbo/opt-kernel-inner-pragma-1/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUNENV += LIBOMPTARGET_KERNEL_TRACE=1
88

99
RUNCMD = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
1010

11-
CFLAGS += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
11+
CFLAGS += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
1212
CLANG = clang
1313
OMP_BIN = $(AOMP)/bin/$(CLANG)
1414
CC = $(OMP_BIN) $(VERBOSE)

test/smoke-limbo/xteam-red-4/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUNENV += LIBOMPTARGET_KERNEL_TRACE=1
88

99
RUNCMD = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
1010

11-
CFLAGS += -fopenmp-target-ignore-env-vars -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
11+
CFLAGS += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-assume-no-nested-parallelism -fopenmp-assume-no-thread-state
1212
CLANG = clang
1313
OMP_BIN = $(AOMP)/bin/$(CLANG)
1414
CC = $(OMP_BIN) $(VERBOSE)

test/smoke-limbo/xteam-red-fast-1/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUNENV += LIBOMPTARGET_KERNEL_TRACE=1
88

99
RUNCMD = ./$(TESTNAME) 2>&1 | $(FILECHECK) $(TESTSRC_MAIN)
1010

11-
CFLAGS += -fopenmp-target-ignore-env-vars -fopenmp-target-fast-reduction
11+
CFLAGS += -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription -fopenmp-target-fast-reduction
1212
CLANG = clang
1313
OMP_BIN = $(AOMP)/bin/$(CLANG)
1414
CC = $(OMP_BIN) $(VERBOSE)

test/smoke/c-heatx/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ TESTSRC_MAIN = c-heatx.c
55
TESTSRC_AUX =
66
TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX)
77

8-
CLANG = clang -fopenmp-target-ignore-env-vars
8+
CLANG = clang -fopenmp-assume-teams-oversubscription -fopenmp-assume-threads-oversubscription
99
OMP_BIN = $(AOMP)/bin/$(CLANG)
1010
CC = $(OMP_BIN) $(VERBOSE)
1111
#-ccc-print-phases

test/smoke/collapse_parallel_spmd/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ TESTSRC_MAIN = collapse_parallel_spmd.c
55
TESTSRC_AUX =
66
TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX)
77

8-
CFLAGS += -O3 -fno-openmp-target-ignore-env-vars
8+
CFLAGS += -O3
99
CLANG ?= clang
1010
OMP_BIN = $(AOMP)/bin/$(CLANG)
1111
CC = $(OMP_BIN) $(VERBOSE)

0 commit comments

Comments
 (0)