Commit 93c9f1c2 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf test: Add extra diagnostics to maps test 



Dump the resultant and comparison maps on failure.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: German Gomez <german.gomez@arm.com>
Cc: Hao Luo <haoluo@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Miaoqian Lin <linmq006@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Shunsuke Nakamura <nakamura.shun@fujitsu.com>
Cc: Song Liu <song@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Stephen Brennan <stephen.s.brennan@oracle.com>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Yury Norov <yury.norov@gmail.com>
Link: https://lore.kernel.org/r/20230404205954.2245628-2-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2a6e5e8a

tools/perf/tests/maps.c

+36 −15
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <inttypes.h>

#include <linux/compiler.h>

#include <linux/kernel.h>

#include "tests.h"
@@ -17,22 +18,42 @@ static int check_maps(struct map_def *merged, unsigned int size, struct maps *ma 
{

	struct map_rb_node *rb_node;

	unsigned int i = 0;

	bool failed = false;



	if (maps__nr_maps(maps) != size) {

		pr_debug("Expected %d maps, got %d", size, maps__nr_maps(maps));

		failed = true;

	} else {

		maps__for_each_entry(maps, rb_node) {

			struct map *map = rb_node->map;



		if (i > 0)

			TEST_ASSERT_VAL("less maps expected", (map && i < size) || (!map && i == size));



		TEST_ASSERT_VAL("wrong map start",  map__start(map) == merged[i].start);

		TEST_ASSERT_VAL("wrong map end",    map__end(map) == merged[i].end);

		TEST_ASSERT_VAL("wrong map name",  !strcmp(map__dso(map)->name, merged[i].name));

		TEST_ASSERT_VAL("wrong map refcnt", refcount_read(&map->refcnt) == 1);



			if (map__start(map) != merged[i].start ||

			    map__end(map) != merged[i].end ||

			    strcmp(map__dso(map)->name, merged[i].name) ||

			    refcount_read(&map->refcnt) != 1) {

				failed = true;

			}

			i++;

		}

	}

	if (failed) {

		pr_debug("Expected:\n");

		for (i = 0; i < size; i++) {

			pr_debug("\tstart: %" PRIu64 " end: %" PRIu64 " name: '%s' refcnt: 1\n",

				merged[i].start, merged[i].end, merged[i].name);

		}

		pr_debug("Got:\n");

		maps__for_each_entry(maps, rb_node) {

			struct map *map = rb_node->map;



	return TEST_OK;

			pr_debug("\tstart: %" PRIu64 " end: %" PRIu64 " name: '%s' refcnt: %d\n",

				map__start(map),

				map__end(map),

				map__dso(map)->name,

				refcount_read(&map->refcnt));

		}

	}

	return failed ? TEST_FAIL : TEST_OK;

}



static int test__maps__merge_in(struct test_suite *t __maybe_unused, int subtest __maybe_unused)