Changeset 2214


Ignore:
Timestamp:
Jun 5, 2012, 6:00:27 PM (7 years ago)
Author:
ksherdy
Message:

Added make all/all_profiling_perf targets.

Location:
proto/parabix2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • proto/parabix2/Makefile

    r2186 r2214  
    11OUTFILE=src/xmlwf.cpp
     2ID_OUTFILE=src/id.cpp
     3DIV2_OUTFILE=src/div2.cpp
     4LOGBASE2_OUTFILE=src/logbase2.cpp
     5DIV2_LOGBASE2_OUTFILE=src/div2_logbase2.cpp
     6BIT_BYTE_OUTFILE=src/bit_byte.cpp
    27
    38PABLO_SRC=parabix2_pablo.py
     
    3035TEMP=t.tmp
    3136
     37avx:    $(PABLO_SRC)
     38        python $(PABLO_COMPILER) $(PABLO_SRC) -t pablo_template_avx.cpp -o $(OUTFILE)
     39
     40all: pablo id div2 logbase2 div2_logbase2 bit_byte
     41
    3242pablo:  $(PABLO_SRC)
    3343        python $(PABLO_COMPILER) $(PABLO_SRC) -t $(PABLO_TEMPLATE) -o $(OUTFILE)
    3444
    35 avx:    $(PABLO_SRC)
    36         python $(PABLO_COMPILER) $(PABLO_SRC) -t pablo_template_avx.cpp -o $(OUTFILE)
    37 
    3845id: template
    39         python $(PABLO_COMPILER) $(ID_GROUP_STRMS_SRC) -t $(TEMP) -l $(GROUP_PREFIX) -o $(OUTFILE) $(PABLO_ADD_DEBUG)
     46        python $(PABLO_COMPILER) $(ID_GROUP_STRMS_SRC) -t $(TEMP) -l $(GROUP_PREFIX) -o $(ID_OUTFILE) $(PABLO_ADD_DEBUG)
    4047
    4148div2: template
    42         python $(PABLO_COMPILER) $(DIV2_GROUP_STRMS_SRC) -t $(TEMP) -l $(GROUP_PREFIX) -o $(OUTFILE) $(PABLO_ADD_DEBUG)
     49        python $(PABLO_COMPILER) $(DIV2_GROUP_STRMS_SRC) -t $(TEMP) -l $(GROUP_PREFIX) -o $(DIV2_OUTFILE) $(PABLO_ADD_DEBUG)
    4350
    4451logbase2: template
    45         python $(PABLO_COMPILER) $(LOGBASE2_GROUP_STRMS_SRC) -t $(TEMP) -l $(GROUP_PREFIX) -o $(OUTFILE) $(PABLO_ADD_DEBUG)
     52        python $(PABLO_COMPILER) $(LOGBASE2_GROUP_STRMS_SRC) -t $(TEMP) -l $(GROUP_PREFIX) -o $(LOGBASE2_OUTFILE) $(PABLO_ADD_DEBUG)
    4653
    4754div2_logbase2: template
    48         python $(PABLO_COMPILER) $(DIV2_LOGBASE2_GROUP_STRMS_SRC) -t $(TEMP) -l $(GROUP_PREFIX) -o $(OUTFILE) $(PABLO_ADD_DEBUG)
     55        python $(PABLO_COMPILER) $(DIV2_LOGBASE2_GROUP_STRMS_SRC) -t $(TEMP) -l $(GROUP_PREFIX) -o $(DIV2_LOGBASE2_OUTFILE) $(PABLO_ADD_DEBUG)
    4956
    5057bit_byte: template
    51         python $(PABLO_COMPILER) $(BIT_BYTE_GROUP_STRMS_SRC) -t $(TEMP) -l $(GROUP_PREFIX) -o $(OUTFILE) $(PABLO_ADD_DEBUG)
     58        python $(PABLO_COMPILER) $(BIT_BYTE_GROUP_STRMS_SRC) -t $(TEMP) -l $(GROUP_PREFIX) -o $(BIT_BYTE_OUTFILE) $(PABLO_ADD_DEBUG)
    5259
    5360template: $(PABLO_SRC) $(PABLO_TEMPLATE_SYMBOL_TABLE)
     
    6370
    6471clean: 
    65         rm -f $(OUTFILE)
     72        rm -f $(OUTFILE) $(ID_OUTFILE) $(DIV2_OUTFILE) $(DIV2_LOGBASE2_OUTFILE) $(BIT_BYTE_OUTFILE)
    6673
    6774
  • proto/parabix2/src/Makefile

    r2212 r2214  
    33TEST=run_all.py
    44PERF=perf_script.py
     5
     6ID_SRCFILE=id.cpp
     7DIV2_SRCFILE=div2.cpp
     8LOGBASE2_SRCFILE=logbase2.cpp
     9DIV2_LOGBASE2_SRCFILE=div2_logbase2.cpp
     10BIT_BYTE_SRCFILE=bit_byte.cpp
    511
    612CC= g++ $(CFLAGS)
     
    2026endif
    2127
    22 all:    $(SRCFILE)
    23         $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS)
     28
    2429
    2530avx:    $(SRCFILE)
    2631        $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) -march=nocona -m64 -mavx
     32
     33all:    $(SRCFILE)
     34        $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS)
    2735
    2836threads:        $(SRCFILE)
     
    3442buffer_profiling: $(SRCFILE)
    3543        $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DBUFFER_PROFILING
    36 
    37 buffer_profiling_perf: $(SRCFILE)
    38         $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DBUFFER_PROFILING  -DPERF_SCRIPT
    3944       
    4045as: $(OUTFILE).s
     
    5863# Symbol Table perf targets
    5964
    60 id_profiling_perf: $(SRCFILE)
    61         $(CC) -o id $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DID_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
     65all_profiling_perf: buffer_profiling_perf id_profiling_perf div2_profiling_perf logbase2_profiling_perf div2_logbase2_profiling_perf bit_byte_profiling_perf
    6266
    63 div2_profiling_perf: $(SRCFILE)
    64         $(CC) -o div2 $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DDIV2_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
     67buffer_profiling_perf: $(SRCFILE)
     68        $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DBUFFER_PROFILING -DPERF_SCRIPT
    6569
    66 logbase2_profiling_perf: $(SRCFILE)
    67         $(CC) -o logbase2 $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DLOGBASE2_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
     70id_profiling_perf: $(ID_SRCFILE)
     71        $(CC) -o id $(ID_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DID_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
    6872
    69 div2_logbase2_profiling_perf: $(SRCFILE)
    70         $(CC) -o div2_logbase2 $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DDIV2_LOGBASE2_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
     73div2_profiling_perf: $(DIV2_SRCFILE)
     74        $(CC) -o div2 $(DIV2_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DDIV2_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
    7175
    72 bit_byte_profiling_perf: $(SRCFILE)
    73         $(CC) -o bit_byte $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DBIT_BYTE_STRATEGY -DBUFFER_PROFILING  -DPERF_SCRIPT
     76logbase2_profiling_perf: $(LOGBASE2_SRCFILE)
     77        $(CC) -o logbase2 $(LOGBASE2_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DLOGBASE2_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
     78
     79div2_logbase2_profiling_perf: $(DIV2_LOGBASE2_SRCFILE)
     80        $(CC) -o div2_logbase2 $(DIV2_LOGBASE2_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DDIV2_LOGBASE2_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
     81
     82bit_byte_profiling_perf: $(BIT_BYTE_SRCFILE)
     83        $(CC) -o bit_byte $(BIT_BYTE_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DBIT_BYTE_STRATEGY -DBUFFER_PROFILING  -DPERF_SCRIPT
    7484
    7585# Symbol Table debug targets
    7686
    77 id_debug: $(SRCFILE)
    78         $(CC) -o id $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DID_STRATEGY  -DDUMP_SYMBOLS
     87all_debug: id_debug div2_debug logbase2_debug div2_logbase2_debug bit_byte_debug
    7988
    80 div2_debug: $(SRCFILE)
    81         $(CC) -o div2 $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DDIV2_STRATEGY -DDUMP_SYMBOLS
     89id_debug: $(ID_SRCFILE)
     90        $(CC) -o id $(ID_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DID_STRATEGY -DDUMP_SYMBOLS
    8291
    83 logbase2_debug: $(SRCFILE)
    84         $(CC) -o logbase2 $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DLOGBASE2_STRATEGY -DDUMP_SYMBOLS
     92div2_debug: $(DIV2_SRCFILE)
     93        $(CC) -o div2 $(DIV2_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DDIV2_STRATEGY -DDUMP_SYMBOLS
    8594
    86 div2_logbase2_debug: $(SRCFILE)
    87         $(CC) -o div2_logbase2 $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DDIV2_LOGBASE2_STRATEGY -DDUMP_SYMBOLS
     95logbase2_debug: $(LOGBASE2_SRCFILE)
     96        $(CC) -o logbase2 $(LOGBASE2_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DLOGBASE2_STRATEGY -DDUMP_SYMBOLS
    8897
    89 bit_byte_debug: $(SRCFILE)
    90         $(CC) -o bit_byte $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DBIT_BYTE_STRATEGY -DDUMP_SYMBOLS
     98div2_logbase2_debug: $(DIV2_LOGBASE2_SRCFILE)
     99        $(CC) -o div2_logbase2 $(DIV2_LOGBASE2_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DDIV2_LOGBASE2_STRATEGY -DDUMP_SYMBOLS
    91100
     101bit_byte_debug: $(BIT_BYTE_SRCFILE)
     102        $(CC) -o bit_byte $(BIT_BYTE_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DBIT_BYTE_STRATEGY -DDUMP_SYMBOLS
     103
  • proto/parabix2/src/perf_script.py

    r2210 r2214  
    77#programs = ['xmlwf','expat','Xerces_SAX','Xerces_DOM']
    88#programs = ['id','div2','logbase2','div2_logbase2','bit_byte']
    9 #programs = ['id','logbase2']
    10 programs = ['xmlwf']
     9programs = ['xmlwf', 'id','logbase2']
     10#programs = ['xmlwf']
    1111testfiles = ['dew.xml','jaw.xml','roads-2.gml','po.xml','soap.xml']
    1212#testfiles = ['dew.u16','jaw.u16','po.u16','roads-2.u16','soap.u16']
Note: See TracChangeset for help on using the changeset viewer.