Changeset 1488


Ignore:
Timestamp:
Sep 23, 2011, 4:30:25 PM (8 years ago)
Author:
ksherdy
Message:

Moved Xerces prototype to xmlwf. Added bit stream iterator. Makefile targets.

Location:
proto/parabix2
Files:
12 added
4 edited

Legend:

Unmodified
Added
Removed
  • proto/parabix2/Makefile

    r1209 r1488  
    11OUTFILE=src/xmlwf.cpp
     2OUTFILE_STL=src/xmlwf_stl.cpp
     3OUTFILE_XERCES=src/xmlwf_xerces.cpp
    24PABLO_SRCFILE=parabix2_pablo.py
     5PABLO_SRCFILE_XERCES=parabix2_pablo_xerces.py
    36PABLO_COMPILER=../Compiler/pablomain.py
    47PABLO_TEMPLATE=pablo_template.cpp
     8PABLO_TEMPLATE_STL=pablo_template_stl.cpp
     9PABLO_TEMPLATE_XERCES=pablo_template_xerces.cpp
    510
    611pablo:  $(PABLO_SRCFILE)
    712        python $(PABLO_COMPILER) $(PABLO_SRCFILE) -t $(PABLO_TEMPLATE) -o $(OUTFILE)
     13
     14stl:    $(PABLO_SRCFILE)
     15        python $(PABLO_COMPILER) $(PABLO_SRCFILE) -t $(PABLO_TEMPLATE_STL) -o $(OUTFILE_STL)
     16
     17xerces: $(PABLO_SRCFILE_XERCES)
     18        python $(PABLO_COMPILER) $(PABLO_SRCFILE_XERCES) -t $(PABLO_TEMPLATE_XERCES) -o $(OUTFILE_XERCES)
    819
    920avx:    $(PABLO_SRCFILE)
  • proto/parabix2/src/Makefile

    r1459 r1488  
     1SRCFILE_XERCES=xmlwf_xerces.cpp
     2OUTFILE_XERCES=xmlwf_xerces
     3
     4SRCFILE_STL=xmlwf_stl.cpp
     5OUTFILE_STL=xmlwf_stl
     6
    17SRCFILE=xmlwf.cpp
    28OUTFILE=xmlwf
     
    2733        $(CC) -o $(OUTFILE) $(SRCFILE) $(AFLAGS)
    2834
     35stl:    $(SRCFILE_STL)
     36        $(CC) -o $(OUTFILE_STL) $(SRCFILE_STL) $(AFLAGS)
     37       
     38xerces: $(SRCFILE_XERCES)
     39        $(CC) -o $(OUTFILE_XERCES) $(SRCFILE_XERCES) $(AFLAGS)
     40
    2941avx:    $(SRCFILE)
    3042        $(CC) -o $(OUTFILE) $(SRCFILE) -march=nocona -m64 -mavx
     
    4254        $(CC) -o $(OUTFILE) $(SRCFILE) $(AFLAGS) -DBUFFER_PROFILING  -DPERF_SCRIPT
    4355
     56buffer_profiling_perf_stl: $(SRCFILE_STL)
     57        $(CC) -o $(OUTFILE_STL) $(SRCFILE_STL) $(AFLAGS) -DBUFFER_PROFILING  -DPERF_SCRIPT
     58
    4459asm:  $(SRCFILE)
    4560        $(CC) -o $(OUTFILE).s $(SRCFILE) $(AFLAGS) -S -fverbose-asm
     
    5166        $(CC) $(OUTFILE).o -o $(OUTFILE)       
    5267
    53 test: $(SRCFILE)
     68test: # $(SRCFILE)
    5469        python $(TEST)
    5570
    5671idisa:  $(SRCFILE)
    5772        python make_idisa.py
    58         $(CC) -o $(OUTFILE) $(SRCFILE) $(AFLAGS) -DUSE_IDISA
     73        $(CC) -o $(OUTFILE) $(SRCFILE) $(AFLAGS)
    5974
    6075clean: 
  • proto/parabix2/src/perf_script.py

    r945 r1488  
    66testfile_home = "../../../trunk/QA/TD/"
    77#programs = ['xmlwf','expat','Xerces_SAX','Xerces_DOM']
    8 programs = ['xmlwf']
     8programs = ['xmlwf_stl','xmlwf']
    99testfiles = ['dew.xml','jaw.xml','roads-2.gml','po.xml','soap.xml']
    1010#testfiles = ['dew.u16','jaw.u16','po.u16','roads-2.u16','soap.u16']
  • proto/parabix2/src/run_all.py

    r814 r1488  
    1313output_files = output_home+"/Files"
    1414output_messages = output_home+"/Messages"
    15 program_to_test = "xmlwf"
     15program_to_test = "xmlwf_xerces"
    1616edition5_program_to_test = 'markup_stats_5e'
    1717testcases = []
Note: See TracChangeset for help on using the changeset viewer.