Changeset 2547


Ignore:
Timestamp:
Oct 24, 2012, 1:19:28 PM (6 years ago)
Author:
ksherdy
Message:

Updated templates for new perfsec.h

Location:
proto/parabix2
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • proto/parabix2/Makefile

    r2307 r2547  
    7070
    7171clean: 
    72         rm -f $(OUTFILE) $(ID_OUTFILE) $(DIV2_OUTFILE) $(DIV2_LOGBASE2_OUTFILE) $(BIT_BYTE_OUTFILE) $(TEMP)
     72        rm -f $(OUTFILE) $(ID_OUTFILE) $(DIV2_OUTFILE) $(LOGBASE2_OUTFILE) $(DIV2_LOGBASE2_OUTFILE) $(BIT_BYTE_OUTFILE) $(TEMP)
    7373
    7474
  • proto/parabix2/pablo_template.cpp

    r2351 r2547  
    2828#ifdef BUFFER_PROFILING
    2929    BOM_Table * parser_timer;
    30 #elif CODE_CLOCKER
    31     //#define NUM_EVENTS 1
    32     //int Events[NUM_EVENTS] = {PAPI_TOT_CYC};
    33     //int Events[NUM_EVENTS] = {PAPI_L2_DCM};
    34     #define NUM_EVENTS 2
    35     int Events[NUM_EVENTS] = {PAPI_TOT_CYC, PAPI_BR_MSP};
    36     int cal_size = 20;
    37     CC * parser_timer = new CC(Events,NUM_EVENTS,cal_size);
     30#elif PAPI
     31                #define PAPI_EVENTS_COUNT 2
     32                int PAPI_EVENTS[PAPI_EVENTS_COUNT] = {PAPI_TOT_CYC, PAPI_BR_MSP};       
     33    CC * parser_timer;
    3834#else
    3935    void * parser_timer;
     
    104100        do_process(infile, outfile);
    105101
     102        fprintf(stdout, "DOUT");
     103
    106104        PERF_SEC_DUMP(parser_timer);
     105
     106        fprintf(stdout, "DOUT");
    107107
    108108        PERF_SEC_DESTROY(parser_timer);
  • proto/parabix2/pablo_template_avx.cpp

    r2280 r2547  
    2525
    2626#ifdef BUFFER_PROFILING
    27         BOM_Table * parser_timer;
    28 
    29 #elif CODE_CLOCKER
    30         #define NUM_EVENTS 1
    31         int Events[NUM_EVENTS] = {PAPI_TOT_CYC};
    32         //int Events[NUM_EVENTS] = {PAPI_L2_DCM};
    33         //int Events[NUM_EVENTS] = {PAPI_TOT_CYC, PAPI_BR_MSP};
    34         int cal_size = 20;
    35         CC * parser_timer = new CC(Events,NUM_EVENTS,cal_size);
     27    BOM_Table * parser_timer;
     28#elif PAPI
     29                #define PAPI_EVENTS_COUNT 2
     30                int PAPI_EVENTS[PAPI_EVENTS_COUNT] = {PAPI_TOT_CYC, PAPI_BR_MSP};       
     31    CC * parser_timer;
    3632#else
    37         void * parser_timer;
     33    void * parser_timer;
    3834#endif
    3935
  • proto/parabix2/pablo_template_lsst.cpp

    r2351 r2547  
    2929
    3030#ifdef BUFFER_PROFILING
    31         BOM_Table * parser_timer;
    32 #elif CODE_CLOCKER
    33         //#define NUM_EVENTS 1
    34         //int Events[NUM_EVENTS] = {PAPI_TOT_CYC};
    35         //int Events[NUM_EVENTS] = {PAPI_L2_DCM};
    36         #define NUM_EVENTS 2
    37         int Events[NUM_EVENTS] = {PAPI_TOT_CYC, PAPI_BR_MSP};
    38         int cal_size = 20;
    39         CC * parser_timer = new CC(Events,NUM_EVENTS,cal_size);
     31    BOM_Table * parser_timer;
     32#elif PAPI
     33                #define PAPI_EVENTS_COUNT 2
     34                int PAPI_EVENTS[PAPI_EVENTS_COUNT] = {PAPI_TOT_CYC, PAPI_BR_MSP};       
     35    CC * parser_timer;
    4036#else
    41         void * parser_timer;
     37    void * parser_timer;
    4238#endif
    4339
  • proto/parabix2/pablo_template_minrefs.cpp

    r1761 r2547  
    2424
    2525#ifdef BUFFER_PROFILING
    26         BOM_Table * parser_timer;
    27 
    28 #elif CODE_CLOCKER
    29         #define NUM_EVENTS 1
    30         int Events[NUM_EVENTS] = {PAPI_TOT_CYC};
    31         //int Events[NUM_EVENTS] = {PAPI_L2_DCM};
    32         //int Events[NUM_EVENTS] = {PAPI_TOT_CYC, PAPI_BR_MSP};
    33         int cal_size = 20;
    34         CC * parser_timer = new CC(Events,NUM_EVENTS,cal_size);
     26    BOM_Table * parser_timer;
     27#elif PAPI
     28                #define PAPI_EVENTS_COUNT 2
     29                int PAPI_EVENTS[PAPI_EVENTS_COUNT] = {PAPI_TOT_CYC, PAPI_BR_MSP};       
     30    CC * parser_timer;
    3531#else
    36         void * parser_timer;
     32    void * parser_timer;
    3733#endif
    3834
  • proto/parabix2/pablo_template_multithreads.cpp

    r2142 r2547  
    9090        BOM_Table * T4_work_timer;     
    9191#endif
     92/*
     93#ifdef BUFFER_PROFILING
     94    BOM_Table * parser_timer;
     95#elif PAPI
     96                #define PAPI_EVENTS_COUNT 2
     97                int PAPI_EVENTS[PAPI_EVENTS_COUNT] = {PAPI_TOT_CYC, PAPI_BR_MSP};       
     98    CC * parser_timer;
     99#else
     100    void * parser_timer;
     101#endif
     102*/
    92103#endif
    93104LineColTracker tracker;
  • proto/parabix2/src/Makefile

    r2296 r2547  
    1313CFLAGS= $(SSE) -O3
    1414SSE=-msse2 #-msse4.1 -DUSE_PTEST #-mssse3 -msse4.1 -msse4.2
    15 INCLUDES=-I../util -I../lib/
     15INCLUDES=-I../util -I../lib/ -I../lib/cc-lib/
    1616
    1717PAPI_DIR=/usr/local/papi
     
    2020ifeq ($(ARCH),32)
    2121    AFLAGS=-march=pentium4
    22     CODE_CLOCKER=-DCODE_CLOCKER -I$(PAPI_DIR)/include -L$(PAPI_DIR)/lib -lpapi
     22    PAPI=-I$(PAPI_DIR)/include -L$(PAPI_DIR)/lib -lpapi -DPAPI -Ilib/cclib
    2323else
    2424    AFLAGS=-march=nocona -m64
    25     CODE_CLOCKER=-DCODE_CLOCKER -I$(PAPI_DIR)/include -L$(PAPI_DIR)/lib -lpapi
     25    PAPI=-I$(PAPI_DIR)/include -L$(PAPI_DIR)/lib -lpapi -DPAPI -Ilib/cclib
    2626endif
    2727
     
    3838
    3939papi_profiling: $(SRCFILE)
    40         $(CC) -o $(OUTFILE) $(SRCFILE) $(INCLUDES) $(AFLAGS) $(CODE_CLOCKER)
     40        $(CC) -o $(OUTFILE) $(SRCFILE) $(INCLUDES) $(AFLAGS) $(PAPI)
    4141
    4242buffer_profiling: $(SRCFILE)
  • proto/parabix2/src/xmlwf_multipass.cpp

    r1469 r2547  
    4646        BOM_Table * postprocess_timer;
    4747
    48 #elif CODE_CLOCKER
     48#elif PAPI
    4949        #define NUM_EVENTS 1
    5050//      int Events[NUM_EVENTS] = {PAPI_TOT_CYC};
Note: See TracChangeset for help on using the changeset viewer.