From 3de22e1b10b6aaded218584dcd3cdf1582e35586 Mon Sep 17 00:00:00 2001
From: hsc <hsc@8c4709b5-6ec9-48aa-a5cd-a96041d1645a>
Date: Wed, 24 Oct 2012 09:58:42 +0000
Subject: [PATCH] nanojpeg: count both jobs and single experiments

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1810 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
---
 src/experiments/nanojpeg/campaign.cc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/experiments/nanojpeg/campaign.cc b/src/experiments/nanojpeg/campaign.cc
index 51727511..060a3c87 100644
--- a/src/experiments/nanojpeg/campaign.cc
+++ b/src/experiments/nanojpeg/campaign.cc
@@ -71,8 +71,10 @@ bool NanoJPEGCampaign::run()
 
 	// experiment count
 	int count_exp = 0;
+	int count_exp_jobs = 0;
 	// known output count
 	int count_known = 0;
+	int count_known_jobs = 0;
 
 	// instruction counter within trace
 	unsigned instr = 0;
@@ -149,6 +151,7 @@ bool NanoJPEGCampaign::run()
 				// new EC with experiments: acc->first -- instr, common_mask
 //				if (reg != RID_EBP && reg != RID_ESI && reg != RID_EDI) {
 					count_exp += add_experiment_ec(acc->first, instr, ev.ip(), reg, common_mask);
+					count_exp_jobs++;
 //				}
 
 				// new memory access EC in access cascade
@@ -193,6 +196,7 @@ bool NanoJPEGCampaign::run()
 					// new EC with known result: acc->first -- instr, common_mask
 //					if (reg != RID_EBP && reg != RID_ESI && reg != RID_EDI) {
 						count_known += add_known_ec(acc->first, instr, ev.ip(), reg, common_mask);
+						count_known_jobs++;
 //					}
 				}
 
@@ -211,8 +215,10 @@ bool NanoJPEGCampaign::run()
 			}
 		}
 	}
-	cout << "experiments planned: " << dec << count_exp << endl;
-	cout << "known outcome ECs: " << dec << count_known << endl;
+	cout << "experiments planned: " << dec << count_exp
+	     << " (" << count_exp_jobs << " jobs)" << endl;
+	cout << "known outcome ECs: " << dec << count_known
+	     << " (" << count_known_jobs << " jobs)" << endl;
 
 	finalize_results();
 	return true;