Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 Dec 2015 21:50:06 +0000 (UTC)
From:      Randall Stewart <rrs@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r292028 - head/usr.sbin/pmcstudy
Message-ID:  <201512092150.tB9Lo6NA034959@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rrs
Date: Wed Dec  9 21:50:06 2015
New Revision: 292028
URL: https://svnweb.freebsd.org/changeset/base/292028

Log:
  White space changes.

Modified:
  head/usr.sbin/pmcstudy/pmcstudy.c

Modified: head/usr.sbin/pmcstudy/pmcstudy.c
==============================================================================
--- head/usr.sbin/pmcstudy/pmcstudy.c	Wed Dec  9 21:49:31 2015	(r292027)
+++ head/usr.sbin/pmcstudy/pmcstudy.c	Wed Dec  9 21:50:06 2015	(r292028)
@@ -45,20 +45,20 @@ static int verbose = 0;
 
 extern char **environ;
 extern struct expression *master_exp;
-struct expression *master_exp=NULL;
+struct expression *master_exp = NULL;
 
 #define PMC_INITIAL_ALLOC 512
 extern char **valid_pmcs;
 char **valid_pmcs = NULL;
 extern int valid_pmc_cnt;
-int valid_pmc_cnt=0;
+int valid_pmc_cnt = 0;
 extern int pmc_allocated_cnt;
-int pmc_allocated_cnt=0;
+int pmc_allocated_cnt = 0;
 
 /*
  * The following two varients on popen and pclose with
  * the cavet that they get you the PID so that you
- * can supply it to pclose so it can send a SIGTERM 
+ * can supply it to pclose so it can send a SIGTERM
  *  to the process.
  */
 static FILE *
@@ -75,7 +75,7 @@ my_popen(const char *command, const char
 	if ((strcmp(dir, "r") != 0) &&
 	    (strcmp(dir, "w") != 0)) {
 		errno = EINVAL;
-		return(NULL);
+		return (NULL);
 	}
 	if (pipe(pdesin) < 0)
 		return (NULL);
@@ -94,14 +94,14 @@ my_popen(const char *command, const char
 	argv[3] = NULL;
 
 	switch (pid = fork()) {
-	case -1:			/* Error. */
+	case -1:		/* Error. */
 		(void)close(pdesin[0]);
 		(void)close(pdesin[1]);
 		(void)close(pdesout[0]);
 		(void)close(pdesout[1]);
 		return (NULL);
 		/* NOTREACHED */
-	case 0:				/* Child. */
+	case 0:		/* Child. */
 		/* Close out un-used sides */
 		(void)close(pdesin[1]);
 		(void)close(pdesout[0]);
@@ -129,8 +129,8 @@ my_popen(const char *command, const char
 		(void)close(pdesin[0]);
 		(void)close(pdesout[0]);
 		(void)close(pdesout[1]);
-		return(io_out);
- 	} else {
+		return (io_out);
+	} else {
 		/* Prepare the input stream */
 		io_in = fdopen(pdesout[0], "r");
 		(void)close(pdesout[1]);
@@ -146,7 +146,7 @@ my_popen(const char *command, const char
  *	if already `pclosed', or waitpid returns an error.
  */
 static void
-my_pclose(FILE *io, pid_t the_pid)
+my_pclose(FILE * io, pid_t the_pid)
 {
 	int pstat;
 	pid_t pid;
@@ -164,33 +164,33 @@ my_pclose(FILE *io, pid_t the_pid)
 
 struct counters {
 	struct counters *next_cpu;
-	char counter_name[MAX_NLEN];		/* Name of counter */
-	int cpu;				/* CPU we are on */
-	int pos;				/* Index we are filling to. */
+	char counter_name[MAX_NLEN];	/* Name of counter */
+	int cpu;		/* CPU we are on */
+	int pos;		/* Index we are filling to. */
 	uint64_t vals[MAX_COUNTER_SLOTS];	/* Last 64 entries */
-	uint64_t sum;				/* Summary of entries */
+	uint64_t sum;		/* Summary of entries */
 };
 
 extern struct counters *glob_cpu[MAX_CPU];
 struct counters *glob_cpu[MAX_CPU];
 
 extern struct counters *cnts;
-struct counters *cnts=NULL;
+struct counters *cnts = NULL;
 
 extern int ncnts;
-int ncnts=0;
+int ncnts = 0;
 
-extern int (*expression)(struct counters *, int);
-int (*expression)(struct counters *, int);
+extern int (*expression) (struct counters *, int);
+int (*expression) (struct counters *, int);
 
-static const char *threshold=NULL;
+static const char *threshold = NULL;
 static const char *command;
 
 struct cpu_entry {
 	const char *name;
 	const char *thresh;
 	const char *command;
-	int (*func)(struct counters *, int);
+	int (*func) (struct counters *, int);
 };
 
 
@@ -198,7 +198,7 @@ struct cpu_type {
 	char cputype[32];
 	int number;
 	struct cpu_entry *ents;
-	void (*explain)(const char *name);
+	void (*explain) (const char *name);
 };
 extern struct cpu_type the_cpu;
 struct cpu_type the_cpu;
@@ -207,6 +207,7 @@ static void
 explain_name_sb(const char *name)
 {
 	const char *mythresh;
+
 	if (strcmp(name, "allocstall1") == 0) {
 		printf("Examine PARTIAL_RAT_STALLS.SLOW_LEA_WINDOW / CPU_CLK_UNHALTED.THREAD_P\n");
 		mythresh = "thresh > .05";
@@ -278,7 +279,7 @@ explain_name_sb(const char *name)
 	} else {
 		printf("Unknown name:%s\n", name);
 		mythresh = "unknown entry";
-        }
+	}
 	printf("If the value printed is %s we may have the ability to improve performance\n", mythresh);
 }
 
@@ -286,6 +287,7 @@ static void
 explain_name_ib(const char *name)
 {
 	const char *mythresh;
+
 	if (strcmp(name, "br_miss") == 0) {
 		printf("Examine ((BR_MISP_RETIRED.ALL_BRANCHES /(BR_MISP_RETIRED.ALL_BRANCHES +\n");
 		printf("         MACHINE_CLEAR.COUNT) * ((UOPS_ISSUED.ANY - UOPS_RETIRED.RETIRE_SLOTS + 4 * INT_MISC.RECOVERY_CYCLES)\n");
@@ -305,7 +307,7 @@ explain_name_ib(const char *name)
 		mythresh = "thresh >= .2";
 	} else if (strcmp(name, "itlbmiss") == 0) {
 		printf("Examine ITLB_MISSES.WALK_DURATION / CPU_CLK_UNHALTED.THREAD_P\n");
-		mythresh = "thresh > .05"; 
+		mythresh = "thresh > .05";
 	} else if (strcmp(name, "icachemiss") == 0) {
 		printf("Examine (ICACHE.IFETCH_STALL - ITLB_MISSES.WALK_DURATION)/ CPU_CLK_UNHALTED.THREAD_P\n");
 		mythresh = "thresh > .05";
@@ -360,7 +362,7 @@ explain_name_ib(const char *name)
 	} else {
 		printf("Unknown name:%s\n", name);
 		mythresh = "unknown entry";
-        }
+	}
 	printf("If the value printed is %s we may have the ability to improve performance\n", mythresh);
 }
 
@@ -369,6 +371,7 @@ static void
 explain_name_has(const char *name)
 {
 	const char *mythresh;
+
 	if (strcmp(name, "eff1") == 0) {
 		printf("Examine (UOPS_RETIRED.RETIRE_SLOTS)/(4 *CPU_CLK_UNHALTED.THREAD_P)\n");
 		mythresh = "thresh < .75";
@@ -377,7 +380,7 @@ explain_name_has(const char *name)
 		mythresh = "thresh > 1.0";
 	} else if (strcmp(name, "itlbmiss") == 0) {
 		printf("Examine ITLB_MISSES.WALK_DURATION / CPU_CLK_UNHALTED.THREAD_P\n");
-		mythresh = "thresh > .05"; 
+		mythresh = "thresh > .05";
 	} else if (strcmp(name, "icachemiss") == 0) {
 		printf("Examine (36 * ICACHE.MISSES)/ CPU_CLK_UNHALTED.THREAD_P\n");
 		mythresh = "thresh > .05";
@@ -439,7 +442,7 @@ explain_name_has(const char *name)
 	} else {
 		printf("Unknown name:%s\n", name);
 		mythresh = "unknown entry";
-        }
+	}
 	printf("If the value printed is %s we may have the ability to improve performance\n", mythresh);
 }
 
@@ -451,16 +454,16 @@ find_counter(struct counters *base, cons
 
 	at = base;
 	len = strlen(name);
-	while(at) {
+	while (at) {
 		if (strncmp(at->counter_name, name, len) == 0) {
-			return(at);
+			return (at);
 		}
 		at = at->next_cpu;
 	}
 	printf("Can't find counter %s\n", name);
 	printf("We have:\n");
 	at = base;
-	while(at) {
+	while (at) {
 		printf("- %s\n", at->counter_name);
 		at = at->next_cpu;
 	}
@@ -475,6 +478,7 @@ allocstall1(struct counters *cpu, int po
 	struct counters *partial;
 	struct counters *unhalt;
 	double un, par, res;
+
 	unhalt = find_counter(cpu, "CPU_CLK_UNHALTED.THREAD_P");
 	partial = find_counter(cpu, "PARTIAL_RAT_STALLS.SLOW_LEA_WINDOW");
 	if (pos != -1) {
@@ -484,9 +488,9 @@ allocstall1(struct counters *cpu, int po
 		par = partial->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = par/un;
+	res = par / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
@@ -497,6 +501,7 @@ allocstall2(struct counters *cpu, int po
 	struct counters *partial;
 	struct counters *unhalt;
 	double un, par, res;
+
 	unhalt = find_counter(cpu, "CPU_CLK_UNHALTED.THREAD_P");
 	partial = find_counter(cpu, "PARTIAL_RAT_STALLS.FLAGS_MERGE_UOP");
 	if (pos != -1) {
@@ -506,9 +511,9 @@ allocstall2(struct counters *cpu, int po
 		par = partial->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = par/un;
+	res = par / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
@@ -517,12 +522,14 @@ br_mispredict(struct counters *cpu, int 
 	struct counters *brctr;
 	struct counters *unhalt;
 	int ret;
+
 /*  3  - (20 * BR_MISP_RETIRED.ALL_BRANCHES)/CPU_CLK_UNHALTED.THREAD_P (thresh >= .2) */
 	double br, un, con, res;
+
 	con = 20.0;
-	
+
 	unhalt = find_counter(cpu, "CPU_CLK_UNHALTED.THREAD_P");
-        brctr = find_counter(cpu, "BR_MISP_RETIRED.ALL_BRANCHES");
+	brctr = find_counter(cpu, "BR_MISP_RETIRED.ALL_BRANCHES");
 	if (pos != -1) {
 		br = brctr->vals[pos] * 1.0;
 		un = unhalt->vals[pos] * 1.0;
@@ -530,9 +537,9 @@ br_mispredict(struct counters *cpu, int 
 		br = brctr->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (con * br)/un;
- 	ret = printf("%1.3f", res);
-	return(ret);
+	res = (con * br) / un;
+	ret = printf("%1.3f", res);
+	return (ret);
 }
 
 static int
@@ -542,22 +549,25 @@ br_mispredictib(struct counters *cpu, in
 	struct counters *unhalt;
 	struct counters *clear, *clear2, *clear3;
 	struct counters *uops;
-	struct counters *recv;	
+	struct counters *recv;
 	struct counters *iss;
+
 /*	  "pmcstat -s CPU_CLK_UNHALTED.THREAD_P -s BR_MISP_RETIRED.ALL_BRANCHES -s MACHINE_CLEARS.MEMORY_ORDERING -s MACHINE_CLEARS.SMC -s MACHINE_CLEARS.MASKMOV -s UOPS_ISSUED.ANY -s UOPS_RETIRED.RETIRE_SLOTS -s INT_MISC.RECOVERY_CYCLES -w 1",*/
 	int ret;
-        /*  
-	 * (BR_MISP_RETIRED.ALL_BRANCHES / 
-	 *         (BR_MISP_RETIRED.ALL_BRANCHES +
-	 *          MACHINE_CLEAR.COUNT) * 
-	 *	   ((UOPS_ISSUED.ANY - UOPS_RETIRED.RETIRE_SLOTS + 4 * INT_MISC.RECOVERY_CYCLES) / (4 * CPU_CLK_UNHALTED.THREAD)))
-	 *
+
+	/*
+	 * (BR_MISP_RETIRED.ALL_BRANCHES / (BR_MISP_RETIRED.ALL_BRANCHES +
+	 * MACHINE_CLEAR.COUNT) * ((UOPS_ISSUED.ANY -
+	 * UOPS_RETIRED.RETIRE_SLOTS + 4 * INT_MISC.RECOVERY_CYCLES) / (4 *
+	 * CPU_CLK_UNHALTED.THREAD)))
+	 * 
 	 */
 	double br, cl, cl2, cl3, uo, re, un, con, res, is;
+
 	con = 4.0;
-	
+
 	unhalt = find_counter(cpu, "CPU_CLK_UNHALTED.THREAD_P");
-        brctr = find_counter(cpu, "BR_MISP_RETIRED.ALL_BRANCHES");
+	brctr = find_counter(cpu, "BR_MISP_RETIRED.ALL_BRANCHES");
 	clear = find_counter(cpu, "MACHINE_CLEARS.MEMORY_ORDERING");
 	clear2 = find_counter(cpu, "MACHINE_CLEARS.SMC");
 	clear3 = find_counter(cpu, "MACHINE_CLEARS.MASKMOV");
@@ -583,9 +593,9 @@ br_mispredictib(struct counters *cpu, in
 		is = iss->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (br/(br + cl + cl2 + cl3) * ((is - uo + con * re) / (con * un)));
- 	ret = printf("%1.3f", res);
-	return(ret);
+	res = (br / (br + cl + cl2 + cl3) * ((is - uo + con * re) / (con * un)));
+	ret = printf("%1.3f", res);
+	return (ret);
 }
 
 static int
@@ -601,9 +611,9 @@ br_mispredict_broad(struct counters *cpu
 	double br, cl, uo, uo_r, re, con, un, res;
 
 	con = 4.0;
-	
+
 	unhalt = find_counter(cpu, "CPU_CLK_UNHALTED.THREAD_P");
-        brctr = find_counter(cpu, "BR_MISP_RETIRED.ALL_BRANCHES");
+	brctr = find_counter(cpu, "BR_MISP_RETIRED.ALL_BRANCHES");
 	clear = find_counter(cpu, "MACHINE_CLEARS.CYCLES");
 	uops = find_counter(cpu, "UOPS_ISSUED.ANY");
 	uops_ret = find_counter(cpu, "UOPS_RETIRED.RETIRE_SLOTS");
@@ -625,8 +635,8 @@ br_mispredict_broad(struct counters *cpu
 		re = recv->sum * 1.0;
 	}
 	res = br / (br + cl) * (uo - uo_r + con * re) / (un * con);
- 	ret = printf("%1.3f", res);
-	return(ret);
+	ret = printf("%1.3f", res);
+	return (ret);
 }
 
 static int
@@ -637,9 +647,12 @@ splitloadib(struct counters *cpu, int po
 	struct counters *l1d, *ldblock;
 	struct counters *unhalt;
 	double un, memd, res, l1, ldb;
-        /*  
-	 * ((L1D_PEND_MISS.PENDING / MEM_LOAD_UOPS_RETIRED.L1_MISS) * LD_BLOCKS.NO_SR) / CPU_CLK_UNHALTED.THREAD_P
-	 * "pmcstat -s CPU_CLK_UNHALTED.THREAD_P -s L1D_PEND_MISS.PENDING -s MEM_LOAD_UOPS_RETIRED.L1_MISS -s LD_BLOCKS.NO_SR -w 1",
+
+	/*
+	 * ((L1D_PEND_MISS.PENDING / MEM_LOAD_UOPS_RETIRED.L1_MISS) *
+	 * LD_BLOCKS.NO_SR) / CPU_CLK_UNHALTED.THREAD_P "pmcstat -s
+	 * CPU_CLK_UNHALTED.THREAD_P -s L1D_PEND_MISS.PENDING -s
+	 * MEM_LOAD_UOPS_RETIRED.L1_MISS -s LD_BLOCKS.NO_SR -w 1",
 	 */
 
 	unhalt = find_counter(cpu, "CPU_CLK_UNHALTED.THREAD_P");
@@ -657,9 +670,9 @@ splitloadib(struct counters *cpu, int po
 		ldb = ldblock->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = ((l1 / memd) * ldb)/un;
+	res = ((l1 / memd) * ldb) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
@@ -669,6 +682,7 @@ splitload(struct counters *cpu, int pos)
 	struct counters *mem;
 	struct counters *unhalt;
 	double con, un, memd, res;
+
 /*  4  - (MEM_UOP_RETIRED.SPLIT_LOADS * 5) / CPU_CLK_UNHALTED.THREAD_P (thresh >= .1)*/
 
 	con = 5.0;
@@ -681,19 +695,23 @@ splitload(struct counters *cpu, int pos)
 		memd = mem->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (memd * con)/un;
+	res = (memd * con) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
 splitstore(struct counters *cpu, int pos)
 {
-        /*  5  - MEM_UOP_RETIRED.SPLIT_STORES / MEM_UOP_RETIRED.ALL_STORES (thresh > 0.01) */
+	/*
+	 * 5  - MEM_UOP_RETIRED.SPLIT_STORES / MEM_UOP_RETIRED.ALL_STORES
+	 * (thresh > 0.01)
+	 */
 	int ret;
 	struct counters *mem_split;
 	struct counters *mem_stores;
 	double memsplit, memstore, res;
+
 	mem_split = find_counter(cpu, "MEM_UOP_RETIRED.SPLIT_STORES");
 	mem_stores = find_counter(cpu, "MEM_UOP_RETIRED.ALL_STORES");
 	if (pos != -1) {
@@ -703,16 +721,19 @@ splitstore(struct counters *cpu, int pos
 		memsplit = mem_split->sum * 1.0;
 		memstore = mem_stores->sum * 1.0;
 	}
-	res = memsplit/memstore;
+	res = memsplit / memstore;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 
 static int
 contested(struct counters *cpu, int pos)
 {
-        /*  6  - (MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM * 60) / CPU_CLK_UNHALTED.THREAD_P (thresh >.05) */
+	/*
+	 * 6  - (MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM * 60) /
+	 * CPU_CLK_UNHALTED.THREAD_P (thresh >.05)
+	 */
 	int ret;
 	struct counters *mem;
 	struct counters *unhalt;
@@ -728,15 +749,18 @@ contested(struct counters *cpu, int pos)
 		memd = mem->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (memd * con)/un;
+	res = (memd * con) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
 contested_has(struct counters *cpu, int pos)
 {
-        /*  6  - (MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM * 84) / CPU_CLK_UNHALTED.THREAD_P (thresh >.05) */
+	/*
+	 * 6  - (MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM * 84) /
+	 * CPU_CLK_UNHALTED.THREAD_P (thresh >.05)
+	 */
 	int ret;
 	struct counters *mem;
 	struct counters *unhalt;
@@ -752,15 +776,18 @@ contested_has(struct counters *cpu, int 
 		memd = mem->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (memd * con)/un;
+	res = (memd * con) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
 contestedbroad(struct counters *cpu, int pos)
 {
-        /*  6  - (MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM * 84) / CPU_CLK_UNHALTED.THREAD_P (thresh >.05) */
+	/*
+	 * 6  - (MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM * 84) /
+	 * CPU_CLK_UNHALTED.THREAD_P (thresh >.05)
+	 */
 	int ret;
 	struct counters *mem;
 	struct counters *mem2;
@@ -770,7 +797,7 @@ contestedbroad(struct counters *cpu, int
 	con = 84.0;
 	unhalt = find_counter(cpu, "CPU_CLK_UNHALTED.THREAD_P");
 	mem = find_counter(cpu, "MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM");
-	mem2 = find_counter(cpu,"MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS");
+	mem2 = find_counter(cpu, "MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS");
 
 	if (pos != -1) {
 		memd = mem->vals[pos] * 1.0;
@@ -781,16 +808,19 @@ contestedbroad(struct counters *cpu, int
 		memtoo = mem2->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = ((memd * con) + memtoo)/un;
+	res = ((memd * con) + memtoo) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 
 static int
 blockstoreforward(struct counters *cpu, int pos)
 {
-        /*  7  - (LD_BLOCKS_STORE_FORWARD * 13) / CPU_CLK_UNHALTED.THREAD_P (thresh >= .05)*/
+	/*
+	 * 7  - (LD_BLOCKS_STORE_FORWARD * 13) / CPU_CLK_UNHALTED.THREAD_P
+	 * (thresh >= .05)
+	 */
 	int ret;
 	struct counters *ldb;
 	struct counters *unhalt;
@@ -806,17 +836,19 @@ blockstoreforward(struct counters *cpu, 
 		ld = ldb->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (ld * con)/un;
+	res = (ld * con) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
 cache2(struct counters *cpu, int pos)
 {
-	/* ** Suspect ***
-	 *  8  - ((MEM_LOAD_RETIRED.L3_HIT * 26) + (MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT * 43) +
-	 *        (MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM * 60)) / CPU_CLK_UNHALTED.THREAD_P (thresh >.2)
+	/*
+	 * ** Suspect *** 8  - ((MEM_LOAD_RETIRED.L3_HIT * 26) +
+	 * (MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT * 43) +
+	 * (MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM * 60)) /
+	 * CPU_CLK_UNHALTED.THREAD_P (thresh >.2)
 	 */
 	int ret;
 	struct counters *mem1, *mem2, *mem3;
@@ -842,16 +874,17 @@ cache2(struct counters *cpu, int pos)
 		me_3 = mem3->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = ((me_1 * con1) + (me_2 * con2) + (me_3 * con3))/un;
+	res = ((me_1 * con1) + (me_2 * con2) + (me_3 * con3)) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
 datasharing(struct counters *cpu, int pos)
 {
-	/* 
-	 * (MEM_LOAD_UOPS_L3_HIT_RETIRED.XSNP_HIT * 43)/ CPU_CLK_UNHALTED.THREAD_P (thresh >.2)
+	/*
+	 * (MEM_LOAD_UOPS_L3_HIT_RETIRED.XSNP_HIT * 43)/
+	 * CPU_CLK_UNHALTED.THREAD_P (thresh >.2)
 	 */
 	int ret;
 	struct counters *mem;
@@ -868,9 +901,9 @@ datasharing(struct counters *cpu, int po
 		me = mem->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (me * con)/un;
+	res = (me * con) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 
 }
 
@@ -878,8 +911,9 @@ datasharing(struct counters *cpu, int po
 static int
 datasharing_has(struct counters *cpu, int pos)
 {
-	/* 
-	 * (MEM_LOAD_UOPS_L3_HIT_RETIRED.XSNP_HIT * 43)/ CPU_CLK_UNHALTED.THREAD_P (thresh >.2)
+	/*
+	 * (MEM_LOAD_UOPS_L3_HIT_RETIRED.XSNP_HIT * 43)/
+	 * CPU_CLK_UNHALTED.THREAD_P (thresh >.2)
 	 */
 	int ret;
 	struct counters *mem;
@@ -896,9 +930,9 @@ datasharing_has(struct counters *cpu, in
 		me = mem->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (me * con)/un;
+	res = (me * con) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 
 }
 
@@ -906,8 +940,9 @@ datasharing_has(struct counters *cpu, in
 static int
 cache2ib(struct counters *cpu, int pos)
 {
-        /*
-	 *  (29 * MEM_LOAD_UOPS_RETIRED.LLC_HIT / CPU_CLK_UNHALTED.THREAD_P (thresh >.2)
+	/*
+	 * (29 * MEM_LOAD_UOPS_RETIRED.LLC_HIT / CPU_CLK_UNHALTED.THREAD_P
+	 * (thresh >.2)
 	 */
 	int ret;
 	struct counters *mem;
@@ -924,9 +959,9 @@ cache2ib(struct counters *cpu, int pos)
 		me = mem->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (con * me)/un; 
+	res = (con * me) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
@@ -934,9 +969,9 @@ cache2has(struct counters *cpu, int pos)
 {
 	/*
 	 * Examine ((MEM_LOAD_UOPS_RETIRED.LLC_HIT * 36) + \
-	 *          (MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT * 72) +
-	 *          (MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM * 84))
-	 *           / CPU_CLK_UNHALTED.THREAD_P
+	 * (MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT * 72) +
+	 * (MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM * 84)) /
+	 * CPU_CLK_UNHALTED.THREAD_P
 	 */
 	int ret;
 	struct counters *mem1, *mem2, *mem3;
@@ -961,16 +996,17 @@ cache2has(struct counters *cpu, int pos)
 		me3 = mem3->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = ((me1 * con1) + (me2 * con2) + (me3 * con3))/un;
+	res = ((me1 * con1) + (me2 * con2) + (me3 * con3)) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
 cache2broad(struct counters *cpu, int pos)
 {
-        /*
-	 *  (29 * MEM_LOAD_UOPS_RETIRED.LLC_HIT / CPU_CLK_UNHALTED.THREAD_P (thresh >.2)
+	/*
+	 * (29 * MEM_LOAD_UOPS_RETIRED.LLC_HIT / CPU_CLK_UNHALTED.THREAD_P
+	 * (thresh >.2)
 	 */
 	int ret;
 	struct counters *mem;
@@ -987,16 +1023,19 @@ cache2broad(struct counters *cpu, int po
 		me = mem->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (con * me)/un; 
+	res = (con * me) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 
 static int
 cache1(struct counters *cpu, int pos)
 {
-	/*  9  - (MEM_LOAD_UOPS_MISC_RETIRED.LLC_MISS * 180) / CPU_CLK_UNHALTED.THREAD_P (thresh >= .2) */
+	/*
+	 * 9  - (MEM_LOAD_UOPS_MISC_RETIRED.LLC_MISS * 180) /
+	 * CPU_CLK_UNHALTED.THREAD_P (thresh >= .2)
+	 */
 	int ret;
 	struct counters *mem;
 	struct counters *unhalt;
@@ -1012,15 +1051,18 @@ cache1(struct counters *cpu, int pos)
 		me = mem->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (me * con)/un;
+	res = (me * con) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
 cache1ib(struct counters *cpu, int pos)
 {
-	/*  9  - (MEM_LOAD_UOPS_L3_MISS_RETIRED.LCOAL_DRAM * 180) / CPU_CLK_UNHALTED.THREAD_P (thresh >= .2) */
+	/*
+	 * 9  - (MEM_LOAD_UOPS_L3_MISS_RETIRED.LCOAL_DRAM * 180) /
+	 * CPU_CLK_UNHALTED.THREAD_P (thresh >= .2)
+	 */
 	int ret;
 	struct counters *mem;
 	struct counters *unhalt;
@@ -1036,16 +1078,19 @@ cache1ib(struct counters *cpu, int pos)
 		me = mem->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (me * con)/un;
+	res = (me * con) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 
 static int
 cache1broad(struct counters *cpu, int pos)
 {
-	/*  9  - (MEM_LOAD_UOPS_L3_MISS_RETIRED.LCOAL_DRAM * 180) / CPU_CLK_UNHALTED.THREAD_P (thresh >= .2) */
+	/*
+	 * 9  - (MEM_LOAD_UOPS_L3_MISS_RETIRED.LCOAL_DRAM * 180) /
+	 * CPU_CLK_UNHALTED.THREAD_P (thresh >= .2)
+	 */
 	int ret;
 	struct counters *mem;
 	struct counters *unhalt;
@@ -1061,16 +1106,20 @@ cache1broad(struct counters *cpu, int po
 		me = mem->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (me * con)/un;
+	res = (me * con) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 
 static int
 dtlb_missload(struct counters *cpu, int pos)
 {
-	/* 10  - ((DTLB_LOAD_MISSES.STLB_HIT * 7) + DTLB_LOAD_MISSES.WALK_DURATION) / CPU_CLK_UNHALTED.THREAD_P (t >=.1) */
+	/*
+	 * 10  - ((DTLB_LOAD_MISSES.STLB_HIT * 7) +
+	 * DTLB_LOAD_MISSES.WALK_DURATION) / CPU_CLK_UNHALTED.THREAD_P (t
+	 * >=.1)
+	 */
 	int ret;
 	struct counters *dtlb_m, *dtlb_d;
 	struct counters *unhalt;
@@ -1089,39 +1138,40 @@ dtlb_missload(struct counters *cpu, int 
 		d2 = dtlb_d->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = ((d1 * con) + d2)/un;
+	res = ((d1 * con) + d2) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
 dtlb_missstore(struct counters *cpu, int pos)
 {
-        /* 
-	 * ((DTLB_STORE_MISSES.STLB_HIT * 7) + DTLB_STORE_MISSES.WALK_DURATION) / 
-	 * CPU_CLK_UNHALTED.THREAD_P (t >= .1) 
-	 */
-        int ret;
-        struct counters *dtsb_m, *dtsb_d;
-        struct counters *unhalt;
-        double con, un, d1, d2, res;
-
-        con = 7.0;
-        unhalt = find_counter(cpu, "CPU_CLK_UNHALTED.THREAD_P");
-        dtsb_m = find_counter(cpu, "DTLB_STORE_MISSES.STLB_HIT");
-        dtsb_d = find_counter(cpu, "DTLB_STORE_MISSES.WALK_DURATION");
-        if (pos != -1) {
-                d1 = dtsb_m->vals[pos] * 1.0;
-                d2 = dtsb_d->vals[pos] * 1.0;
-                un = unhalt->vals[pos] * 1.0;
-        } else {
-                d1 = dtsb_m->sum * 1.0;
-                d2 = dtsb_d->sum * 1.0;
-                un = unhalt->sum * 1.0;
-        }
-        res = ((d1 * con) + d2)/un;
-        ret = printf("%1.3f", res);
-        return(ret);
+	/*
+	 * ((DTLB_STORE_MISSES.STLB_HIT * 7) +
+	 * DTLB_STORE_MISSES.WALK_DURATION) / CPU_CLK_UNHALTED.THREAD_P (t
+	 * >= .1)
+	 */
+	int ret;
+	struct counters *dtsb_m, *dtsb_d;
+	struct counters *unhalt;
+	double con, un, d1, d2, res;
+
+	con = 7.0;
+	unhalt = find_counter(cpu, "CPU_CLK_UNHALTED.THREAD_P");
+	dtsb_m = find_counter(cpu, "DTLB_STORE_MISSES.STLB_HIT");
+	dtsb_d = find_counter(cpu, "DTLB_STORE_MISSES.WALK_DURATION");
+	if (pos != -1) {
+		d1 = dtsb_m->vals[pos] * 1.0;
+		d2 = dtsb_d->vals[pos] * 1.0;
+		un = unhalt->vals[pos] * 1.0;
+	} else {
+		d1 = dtsb_m->sum * 1.0;
+		d2 = dtsb_d->sum * 1.0;
+		un = unhalt->sum * 1.0;
+	}
+	res = ((d1 * con) + d2) / un;
+	ret = printf("%1.3f", res);
+	return (ret);
 }
 
 static int
@@ -1142,16 +1192,19 @@ itlb_miss(struct counters *cpu, int pos)
 		d1 = itlb->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = d1/un;
+	res = d1 / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 
 static int
 itlb_miss_broad(struct counters *cpu, int pos)
 {
-	/* (7 * ITLB_MISSES.STLB_HIT_4K + ITLB_MISSES.WALK_DURATION) / CPU_CLK_UNTHREAD_P   */
+	/*
+	 * (7 * ITLB_MISSES.STLB_HIT_4K + ITLB_MISSES.WALK_DURATION) /
+	 * CPU_CLK_UNTHREAD_P
+	 */
 	int ret;
 	struct counters *itlb;
 	struct counters *unhalt;
@@ -1170,16 +1223,19 @@ itlb_miss_broad(struct counters *cpu, in
 		un = unhalt->sum * 1.0;
 		k = four_k->sum * 1.0;
 	}
-	res = (7.0 * k + d1)/un;
+	res = (7.0 * k + d1) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 
 static int
 icache_miss(struct counters *cpu, int pos)
 {
-	/* (ICACHE.IFETCH_STALL - ITLB_MISSES.WALK_DURATION) / CPU_CLK_UNHALTED.THREAD_P IB */
+	/*
+	 * (ICACHE.IFETCH_STALL - ITLB_MISSES.WALK_DURATION) /
+	 * CPU_CLK_UNHALTED.THREAD_P IB
+	 */
 
 	int ret;
 	struct counters *itlb, *icache;
@@ -1198,9 +1254,9 @@ icache_miss(struct counters *cpu, int po
 		ic = icache->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (ic-d1)/un;
+	res = (ic - d1) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 
 }
 
@@ -1224,16 +1280,16 @@ icache_miss_has(struct counters *cpu, in
 		ic = icache->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = (con * ic)/un;
+	res = (con * ic) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 
 }
 
 static int
 lcp_stall(struct counters *cpu, int pos)
 {
-         /* ILD_STALL.LCP/CPU_CLK_UNHALTED.THREAD_P IB */
+	/* ILD_STALL.LCP/CPU_CLK_UNHALTED.THREAD_P IB */
 	int ret;
 	struct counters *ild;
 	struct counters *unhalt;
@@ -1248,9 +1304,9 @@ lcp_stall(struct counters *cpu, int pos)
 		d1 = ild->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = d1/un;
+	res = d1 / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 
 }
 
@@ -1258,7 +1314,10 @@ lcp_stall(struct counters *cpu, int pos)
 static int
 frontendstall(struct counters *cpu, int pos)
 {
-      /* 12  -  IDQ_UOPS_NOT_DELIVERED.CORE / (CPU_CLK_UNHALTED.THREAD_P * 4) (thresh >= .15) */
+	/*
+	 * 12  -  IDQ_UOPS_NOT_DELIVERED.CORE / (CPU_CLK_UNHALTED.THREAD_P *
+	 * 4) (thresh >= .15)
+	 */
 	int ret;
 	struct counters *idq;
 	struct counters *unhalt;
@@ -1274,17 +1333,20 @@ frontendstall(struct counters *cpu, int 
 		id = idq->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = id/(un * con);
+	res = id / (un * con);
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
 clears(struct counters *cpu, int pos)
 {
-	/* 13  - ((MACHINE_CLEARS.MEMORY_ORDERING + MACHINE_CLEARS.SMC + MACHINE_CLEARS.MASKMOV ) * 100 )  
-	 *         / CPU_CLK_UNHALTED.THREAD_P (thresh  >= .02)*/
-	
+	/*
+	 * 13  - ((MACHINE_CLEARS.MEMORY_ORDERING + MACHINE_CLEARS.SMC +
+	 * MACHINE_CLEARS.MASKMOV ) * 100 )  / CPU_CLK_UNHALTED.THREAD_P
+	 * (thresh  >= .02)
+	 */
+
 	int ret;
 	struct counters *clr1, *clr2, *clr3;
 	struct counters *unhalt;
@@ -1295,7 +1357,7 @@ clears(struct counters *cpu, int pos)
 	clr1 = find_counter(cpu, "MACHINE_CLEARS.MEMORY_ORDERING");
 	clr2 = find_counter(cpu, "MACHINE_CLEARS.SMC");
 	clr3 = find_counter(cpu, "MACHINE_CLEARS.MASKMOV");
-	
+
 	if (pos != -1) {
 		cl1 = clr1->vals[pos] * 1.0;
 		cl2 = clr2->vals[pos] * 1.0;
@@ -1307,9 +1369,9 @@ clears(struct counters *cpu, int pos)
 		cl3 = clr3->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = ((cl1 + cl2 + cl3) * con)/un;
+	res = ((cl1 + cl2 + cl3) * con) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
@@ -1340,9 +1402,9 @@ clears_broad(struct counters *cpu, int p
 		un = unhalt->sum * 1.0;
 	}
 	/* Formula not listed but extrapulated to add the cy ?? */
-	res = ((cl1 + cl2 + cl3 + cy) * con)/un;
+	res = ((cl1 + cl2 + cl3 + cy) * con) / un;
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
@@ -1364,9 +1426,9 @@ microassist(struct counters *cpu, int po
 		id = idq->sum * 1.0;
 		un = unhalt->sum * 1.0;
 	}
-	res = id/(un * con);
+	res = id / (un * con);
 	ret = printf("%1.3f", res);
-	return(ret);
+	return (ret);
 }
 
 static int
@@ -1395,16 +1457,19 @@ microassist_broad(struct counters *cpu, 
 		uoi = uopiss->sum * 1.0;
 		uor = uopret->sum * 1.0;
 	}
-	res = (uor/uoi) * (id/(un * con));
+	res = (uor / uoi) * (id / (un * con));
 	ret = printf("%1.3f", res);

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512092150.tB9Lo6NA034959>