located the bug with intel build of pin 3.4 that doesn\'t allow for xbegin or xend instructions to occur when monitoring branch instructions as part of ppm

Author: BeauJoh

Makefile

@@ -6,7 +6,7 @@ endif
 
 include $(CONFIG_ROOT)/makefile.config
 include $(TOOLS_ROOT)/Config/makefile.default.rules
-CXXFLAGS = -std=gnu++98 -DVERBOSE -Wall -Werror -Wno-unknown-pragmas $(DBG) $(OPT) 
+CXXFLAGS = -std=gnu++11 -DVERBOSE -Wall -Werror -Wno-unknown-pragmas $(DBG) $(OPT) 
 
 SRC_DIR := .
 SRC_FILES := $(wildcard $(SRC_DIR)/*.cpp)

mica.cpp

@@ -80,12 +80,16 @@ ofstream _log;
 /* append <pid>_pin.out to name if necessary */
 const char *mkfilename(const char *name)
 {
-	stringstream ret;
-	if (append_pid)
-		ret << name << "_" << setfill('0') << setw(5) << getpid() << "_pin.out";
-	else
-		ret << name << "_pin.out";
-	return ret.str().c_str();
+    char retx[100];
+	if (append_pid){
+        sprintf(retx,"%s_%d_pin.out",name,getpid());
+    }
+	else{
+        sprintf(retx,"%s_pin.out",name);
+    }
+    char * x = (char*)malloc(sizeof(const char)*100);
+    strcpy(x,retx);
+	return (const char*)x;
 }
 
 // find buffer entry for instruction at given address in a hash table

mica_ilp.cpp

@@ -138,9 +138,9 @@ void init_ilp_one(){
 			cerr << "ERROR! Interval size is not a multiple of ILP buffer size. (" << interval_size << " vs " << ILP_BUFFER_SIZE << ")" << endl;
 			exit(-1);
 		}
-		stringstream filename;
-		filename << "ilp-win" << win_size << "_phases_int";
-		output_file_ilp_one.open(mkfilename(filename.str().c_str()), ios::out|ios::trunc);
+		char filename[100];
+        sprintf(filename, "ilp-win%d_phases_int", win_size);
+		output_file_ilp_one.open(mkfilename(filename), ios::out|ios::trunc);
 		output_file_ilp_one.close();
 	}
 }
@@ -207,9 +207,10 @@ VOID ilp_instr_intervals_one(){
 
 	if(interval_ins_count_for_hpc_alignment == interval_size){
 
-		stringstream filename;
-		filename << "ilp-win" << win_size << "_phases_int";
-		output_file_ilp_one.open(mkfilename(filename.str().c_str()), ios::out|ios::app);
+        char filename[100];
+        sprintf(filename, "ilp-win%d_phases_int", win_size);
+
+		output_file_ilp_one.open(mkfilename(filename), ios::out|ios::app);
 
 		output_file_ilp_one << interval_size << " " << cpuClock_interval << endl;
 
@@ -408,18 +409,19 @@ VOID writeMem_ilp_one(ADDRINT effAddr, ADDRINT size){
 /* finishing... */
 VOID fini_ilp_one(INT32 code, VOID* v){
 
-	stringstream filename;
+    char filename[100];
 
 	fini_ilp_buffering_one();
 
 	if(interval_size == -1){
-		filename << "ilp-win" << win_size << "_full_int";
-		output_file_ilp_one.open(mkfilename(filename.str().c_str()), ios::out|ios::trunc);
+        sprintf(filename, "ilp-win%d_full_int", win_size);
+
+        output_file_ilp_one.open(mkfilename(filename), ios::out|ios::trunc);
 		output_file_ilp_one << total_ins_count;
 	}
 	else{
-		filename << "ilp-win" << win_size << "_phases_int";
-		output_file_ilp_one.open(mkfilename(filename.str().c_str()), ios::out|ios::app);
+        sprintf(filename, "ilp-win%d_phases_int", win_size);
+        output_file_ilp_one.open(mkfilename(filename), ios::out|ios::app);
 		output_file_ilp_one << interval_ins_count;
 	}
 	output_file_ilp_one << " " << cpuClock_interval << endl;

mica_ppm.cpp

@@ -532,8 +532,9 @@ void register_condBr(ADDRINT ins_addr){
 	indices_condBr[numStatCondBranchInst++] = ins_addr;
 }
 
+static int _count  = 0;
 VOID instrument_ppm_cond_br(INS ins){
-	UINT32 index = index_condBr(INS_Address(ins));
+    UINT32 index = index_condBr(INS_Address(ins));
 	if(index < 1){
 
 		/* We don't know the number of static conditional branch instructions up front,
@@ -544,8 +545,21 @@ VOID instrument_ppm_cond_br(INS ins){
 		index = numStatCondBranchInst;
 
 		register_condBr(INS_Address(ins));
+        register_condBr(INS_Address(ins));
 	}
-	INS_InsertCall(ins, IPOINT_BEFORE, (AFUNPTR)condBr, IARG_UINT32, index, IARG_BRANCH_TAKEN, IARG_END);
+    
+    const char* str = INS_Disassemble(ins).c_str();
+    const char* substr = "xbegin";
+    if (strncmp(str, substr, strlen(substr)) == 0){
+        printf("as of pin 3.4 -- I don't think we can parse xbegin so skipping...\n");
+        return;
+    }
+    substr = "xend";
+    if (strncmp(str, substr, strlen(substr)) == 0){
+        printf("as of pin 3.4 -- I don't think we can parse xend so skipping...\n");
+        return;
+    }
+    INS_InsertCall(ins, IPOINT_BEFORE, (AFUNPTR)condBr,IARG_UINT32, index, IARG_BRANCH_TAKEN, IARG_END);
 }
 
 /* instrumenting (instruction level) */