Skip to content

Commit

Permalink
selftests/powerpc: Add flags.mk to support pmu buildable
Browse files Browse the repository at this point in the history
When running `make -C powerpc/pmu run_tests` from top level selftests
directory, currently this error is being reported:

  make: Entering directory '/home/maddy/linux/tools/testing/selftests/powerpc/pmu'
  Makefile:40: warning: overriding recipe for target 'emit_tests'
  ../../lib.mk:111: warning: ignoring old recipe for target 'emit_tests'
  gcc -m64    count_instructions.c ../harness.c event.c lib.c ../utils.c loop.S  -o /home/maddy/selftest_output//count_instructions
  In file included from count_instructions.c:13:
  event.h:12:10: fatal error: utils.h: No such file or directory
  12 | #include "utils.h"
    |          ^~~~~~~~~
  compilation terminated.

This is due to missing of include path in CFLAGS. That is, CFLAGS and
GIT_VERSION macros are defined in the powerpc/ folder Makefile which
in this case is not involved.

To address the failure in case of executing specific sub-folder test
directly, a new rule file has been addded by the patch called "flags.mk"
under selftest/powerpc/ folder and is linked to all the Makefile of
powerpc/pmu sub-folders.

Reported-by: Sachin Sant <sachinp@linux.ibm.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Tested-by: Sachin Sant <sachinp@linux.ibm.com>
[mpe: Fixup ifeq, make GIT_VERSION simply expanded to avoid re-executing git describe]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240229093711.581230-2-maddy@linux.ibm.com
  • Loading branch information
Madhavan Srinivasan authored and Michael Ellerman committed Apr 29, 2024
1 parent 3749684 commit 5553a79
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 0 deletions.
12 changes: 12 additions & 0 deletions tools/testing/selftests/powerpc/flags.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#This checks for any ENV variables and add those.

ifeq ($(GIT_VERSION),)
GIT_VERSION := $(shell git describe --always --long --dirty || echo "unknown")
export GIT_VERSION
endif

ifeq ($(CFLAGS),)
CFLAGS := -std=gnu99 -O2 -Wall -Werror -DGIT_VERSION='"$(GIT_VERSION)"' -I$(selfdir)/powerpc/include $(CFLAGS)
export CFLAGS
endif

1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/pmu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ EXTRA_SOURCES := ../harness.c event.c lib.c ../utils.c

top_srcdir = ../../../../..
include ../../lib.mk
include ../flags.mk

all: $(TEST_GEN_PROGS) ebb sampling_tests event_code_tests

Expand Down
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/pmu/ebb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ TEST_GEN_PROGS := reg_access_test event_attributes_test cycles_test \

top_srcdir = ../../../../../..
include ../../../lib.mk
include ../../flags.mk

# The EBB handler is 64-bit code and everything links against it
CFLAGS += -m64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ TEST_GEN_PROGS := group_constraint_pmc56_test group_pmc56_exclude_constraints_te

top_srcdir = ../../../../../..
include ../../../lib.mk
include ../../flags.mk

CFLAGS += -m64

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ TEST_GEN_PROGS := mmcr0_exceptionbits_test mmcr0_cc56run_test mmcr0_pmccext_test

top_srcdir = ../../../../../..
include ../../../lib.mk
include ../../flags.mk

CFLAGS += -m64

Expand Down

0 comments on commit 5553a79

Please sign in to comment.