Changeset 1688 for proto


Ignore:
Timestamp:
Nov 16, 2011, 1:45:27 PM (8 years ago)
Author:
vla24
Message:

SymbolTable?: renaming dictionary prefixed files into wcd

Location:
proto/SymbolTable
Files:
1 added
3 edited
16 moved

Legend:

Unmodified
Added
Removed
  • proto/SymbolTable/Makefile

    r1686 r1688  
    11WCD_OUTFILE=src/wcd.cpp
    22
    3 PABLO_WCD=dictionary.py
    4 PABLO_WCD_ID=dictionary_id.py
    5 PABLO_WCD_PBGS_ID=dictionary_pbgs_id.py
    6 PABLO_WCD_PBGS_ID_ADV=dictionary_pbgs_id_adv.py
    7 PABLO_WCD_PBGS_LOG=dictionary_pbgs_log.py
    8 PABLO_WCD_PBGS_DIV=dictionary_pbgs_div.py
     3PABLO_WCD=wcd.py
     4PABLO_WCD_ID=wcd_id.py
     5PABLO_WCD_PBGS_ID=wcd_pbgs_id.py
     6PABLO_WCD_PBGS_ID_ADV=wcd_pbgs_id_adv.py
     7PABLO_WCD_PBGS_LOG=wcd_pbgs_log.py
     8PABLO_WCD_PBGS_DIV=wcd_pbgs_div.py
    99
    10 WCD_STL_TEMPLATE=dictionary_stl_template.cpp
    11 WCD_LS_TEMPLATE=dictionary_ls_template.cpp
    12 WCD_HASH_TEMPLATE=dictionary_hash_template.cpp
    13 WCD_IDENTITY_TEMPLATE=dictionary_identity_template.cpp
    14 WCD_PBGS_ID_TEMPLATE=dictionary_pbgs_identity_template.cpp
    15 WCD_PBGS_LOG_TEMPLATE=dictionary_pbgs_log_template.cpp
    16 WCD_PBGS_DIV_TEMPLATE=dictionary_pbgs_div_template.cpp
     10WCD_STL_TEMPLATE=wcd_stl_template.cpp
     11WCD_LS_TEMPLATE=wcd_ls_template.cpp
     12WCD_HASH_TEMPLATE=wcd_hash_template.cpp
     13WCD_IDENTITY_TEMPLATE=wcd_identity_template.cpp
     14WCD_PBGS_ID_TEMPLATE=wcd_pbgs_identity_template.cpp
     15WCD_PBGS_LOG_TEMPLATE=wcd_pbgs_log_template.cpp
     16WCD_PBGS_DIV_TEMPLATE=wcd_pbgs_div_template.cpp
    1717
    1818XMLWF_OUTFILE=src/xmlwf.cpp
  • proto/SymbolTable/build_wcd.sh

    r1686 r1688  
    1 make wcd_pbgs_div && cd src && make dict && cd .. && ./src/dictionary test/test_files/dict_bezier.txt
     1make wcd_pbgs_div && cd src && make wcd && cd .. && ./src/wcd test/test_files/dict_bezier.txt
  • proto/SymbolTable/perf-build_xmlwf.sh

    r1685 r1688  
    1 cd src && make buffer_profiling_perf && python perf_script.py && cd ..
     1cd src && make buffer_profiling_perf && python perf_script.py xmlwf && cd ..
    22
  • proto/SymbolTable/src/Makefile

    r1666 r1688  
    1 DICT_SRCFILE=dictionary.cpp $(SYMTAB_LIB)/bitstream_hash_table.cpp $(SYMTAB_LIB)/hash_symbol_table.cpp $(SYMTAB_LIB)/ls_symbol_table.cxx $(SYMTAB_LIB)/symtab.cxx
    2 DICT_OUTFILE=dictionary
     1WCD_SRCFILE=wcd.cpp $(SYMTAB_LIB)/bitstream_hash_table.cpp $(SYMTAB_LIB)/hash_symbol_table.cpp $(SYMTAB_LIB)/ls_symbol_table.cxx $(SYMTAB_LIB)/symtab.cxx
     2WCD_OUTFILE=wcd
    33
    44SRCFILE=xmlwf.cpp $(SYMTAB_LIB)/bitstream_hash_table.cpp $(SYMTAB_LIB)/hash_symbol_table.cpp $(SYMTAB_LIB)/ls_symbol_table.cxx $(SYMTAB_LIB)/symtab.cxx
     
    2828        g++ -O1 -o $(OUTFILE) $(SRCFILE) -march=nocona -m64 -msse2 -DBUFFER_PROFILING  -DPERF_SCRIPT
    2929
    30 dict:   $(DICT_SRCFILE)
    31         $(CC) $(INCLUDES) -o $(DICT_OUTFILE) $(DICT_SRCFILE) $(AFLAGS)
     30wcd:    $(WCD_SRCFILE)
     31        $(CC) $(INCLUDES) -o $(WCD_OUTFILE) $(WCD_SRCFILE) $(AFLAGS)
     32
     33buffer_profiling_perf_wcd: $(WCD_SRCFILE)
     34        $(CC) $(INCLUDES) -o $(WCD_OUTFILE) $(WCD_SRCFILE) $(AFLAGS) -DBUFFER_PROFILING  -DPERF_SCRIPT
    3235
    3336all:
  • proto/SymbolTable/src/perf_script.py

    r1460 r1688  
    1111  mes_f = open('mesfile', 'w')
    1212  for program in programs:
    13     for testfile in testfiles: 
     13    for testfile in testfiles:
    1414      for i in range(10):
    15         call(['./'+program, testfile_home+testfile], stderr=mes_f)
    16        
     15        call(['./'+program, testfile_home+testfile], stderr=mes_f)
     16
    1717def analyze_rslt():     
    1818      mes_f = open('mesfile', 'r')
     
    2121      rows = {}
    2222      for r in results[:-1]:
    23         results_int.append(int(r))
     23        results_int.append(int(r))
    2424      first_row = '\t\t'
    2525      for testfile in testfiles:
    26         first_row += testfile + '  &\t'
     26        first_row += testfile + '  &\t'
    2727      first_row =  first_row[:-4]
    2828      print first_row
    2929      for program in programs:
    30         row = program + '   &\t'
    31         for testfile in testfiles:
    32           result = results_int[0:10]
    33           results_int = results_int[10:]
    34           row +=  str(min(result)/1000.0) + '   &\t'
    35         row = row[:-4]
    36         row +='\\\\ \\hline'
    37         print row
     30        row = program + '   &\t'
     31        for testfile in testfiles:
     32          result = results_int[0:10]
     33          results_int = results_int[10:]
     34          row +=  str(min(result)/1000.0) + '   &\t'
     35        row = row[:-4]
     36        row +='\\\\ \\hline'
     37        print row
    3838       
    3939       
Note: See TracChangeset for help on using the changeset viewer.