Commit 5339792b authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Shuah Khan
Browse files

selftests/resctrl: Add test groups and name L3 CAT test L3_CAT 



To select test to run -t parameter can be used. However, -t cat
currently maps to L3 CAT test which will be confusing after more CAT
related tests will be added.

Allow selecting tests as groups and call L3 CAT test "L3_CAT", "CAT"
group will enable all CAT related tests.

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarMaciej Wieczor-Retman <maciej.wieczor-retman@intel.com>
Reviewed-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 6f1a214d

tools/testing/selftests/resctrl/cat_test.c

+2 −1
Original line number Diff line number Diff line
@@ -295,7 +295,8 @@ static int cat_run_test(const struct resctrl_test *test, const struct user_param 
}



struct resctrl_test l3_cat_test = {

	.name = "CAT",

	.name = "L3_CAT",

	.group = "CAT",

	.resource = "L3",

	.feature_check = test_resource_feature_check,

	.run_test = cat_run_test,

tools/testing/selftests/resctrl/resctrl.h

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ struct user_params { 
/*

 * resctrl_test:	resctrl test definition

 * @name:		Test name

 * @group:		Test group - a common name for tests that share some characteristic

 *			(e.g., L3 CAT test belongs to the CAT group). Can be NULL

 * @resource:		Resource to test (e.g., MB, L3, L2, etc.)

 * @vendor_specific:	Bitmask for vendor-specific tests (can be 0 for universal tests)

 * @disabled:		Test is disabled
@@ -73,6 +75,7 @@ struct user_params { 
 */

struct resctrl_test {

	const char	*name;

	const char	*group;

	const char	*resource;

	unsigned int	vendor_specific;

	bool		disabled;

tools/testing/selftests/resctrl/resctrl_tests.c

+11 −5
Original line number Diff line number Diff line
@@ -65,11 +65,15 @@ static void cmd_help(void) 
	printf("usage: resctrl_tests [-h] [-t test list] [-n no_of_bits] [-b benchmark_cmd [option]...]\n");

	printf("\t-b benchmark_cmd [option]...: run specified benchmark for MBM, MBA and CMT\n");

	printf("\t   default benchmark is builtin fill_buf\n");

	printf("\t-t test list: run tests specified in the test list, ");

	printf("\t-t test list: run tests/groups specified by the list, ");

	printf("e.g. -t mbm,mba,cmt,cat\n");

	printf("\t\tSupported tests:\n");

	for (i = 0; i < ARRAY_SIZE(resctrl_tests); i++)

	printf("\t\tSupported tests (group):\n");

	for (i = 0; i < ARRAY_SIZE(resctrl_tests); i++) {

		if (resctrl_tests[i]->group)

			printf("\t\t\t%s (%s)\n", resctrl_tests[i]->name, resctrl_tests[i]->group);

		else

			printf("\t\t\t%s\n", resctrl_tests[i]->name);

	}

	printf("\t-n no_of_bits: run cache tests using specified no of bits in cache bit mask\n");

	printf("\t-p cpu_no: specify CPU number to run the test. 1 is default\n");

	printf("\t-h: help\n");
@@ -199,7 +203,9 @@ int main(int argc, char **argv) 
				bool found = false;



				for (i = 0; i < ARRAY_SIZE(resctrl_tests); i++) {

					if (!strcasecmp(token, resctrl_tests[i]->name)) {

					if (!strcasecmp(token, resctrl_tests[i]->name) ||

					    (resctrl_tests[i]->group &&

					     !strcasecmp(token, resctrl_tests[i]->group))) {

						if (resctrl_tests[i]->disabled)

							tests++;

						resctrl_tests[i]->disabled = false;