Changeset 1666 for proto


Ignore:
Timestamp:
Nov 7, 2011, 3:23:29 PM (8 years ago)
Author:
vla24
Message:

SymbolTable?: Added natural language dictionary templates that uses symbol table

Location:
proto/SymbolTable
Files:
15 added
5 edited

Legend:

Unmodified
Added
Removed
  • proto/SymbolTable/Makefile

    r1457 r1666  
    1 OUTFILE=src/xmlwf.cpp
     1DICTIONARY_OUTFILE=src/dictionary.cpp
     2
     3PABLO_DICTIONARY=dictionary.py
     4PABLO_DICTIONARY_ID=dictionary_id.py
     5PABLO_DICTIONARY_PBGS_ID=dictionary_pbgs_id.py
     6PABLO_DICTIONARY_PBGS_ID_ADV=dictionary_pbgs_id_adv.py
     7PABLO_DICTIONARY_PBGS_LOG=dictionary_pbgs_log.py
     8PABLO_DICTIONARY_PBGS_DIV=dictionary_pbgs_div.py
     9
     10DICTIONARY_STL_TEMPLATE=dictionary_stl_template.cpp
     11DICTIONARY_LS_TEMPLATE=dictionary_ls_template.cpp
     12DICTIONARY_HASH_TEMPLATE=dictionary_hash_template.cpp
     13DICTIONARY_IDENTITY_TEMPLATE=dictionary_identity_template.cpp
     14DICTIONARY_PBGS_ID_TEMPLATE=dictionary_pbgs_identity_template.cpp
     15DICTIONARY_PBGS_LOG_TEMPLATE=dictionary_pbgs_log_template.cpp
     16DICTIONARY_PBGS_DIV_TEMPLATE=dictionary_pbgs_div_template.cpp
     17
     18XMLWF_OUTFILE=src/xmlwf.cpp
    219
    320PABLO_SRCFILE=../parabix2/parabix2_pablo.py
    421PABLO_COMPILER=../Compiler/pablomain.py
     22
    523PABLO_SYMTAB_ID=parabix2_symtab_id.py
    624PABLO_SYMTAB_PBS=parabix2_symtab_pbs.py
     
    1937PABLO_FLAGS=#-a
    2038
     39dict_stl:       $(PABLO_DICTIONARY)
     40        python $(PABLO_COMPILER) $(PABLO_DICTIONARY) -t $(DICTIONARY_STL_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     41
     42dict_ls:        $(PABLO_DICTIONARY)
     43        python $(PABLO_COMPILER) $(PABLO_DICTIONARY) -t $(DICTIONARY_LS_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     44
     45dict_hash:      $(PABLO_DICTIONARY)
     46        python $(PABLO_COMPILER) $(PABLO_DICTIONARY) -t $(DICTIONARY_HASH_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     47
     48dict_id:        $(PABLO_DICTIONARY_ID)
     49        python $(PABLO_COMPILER) $(PABLO_DICTIONARY_ID) -t $(DICTIONARY_IDENTITY_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     50
     51dict_pbgs_id:   $(PABLO_DICTIONARY_PBGS_ID) # Paralel bitstream based group sorting
     52        python $(PABLO_COMPILER) $(PABLO_DICTIONARY_PBGS_ID) -t $(DICTIONARY_PBGS_ID_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     53
     54dict_pbgs_id_adv:       $(PABLO_DICTIONARY_PBGS_ID_ADV) # Paralel bitstream based group sorting
     55        python $(PABLO_COMPILER) $(PABLO_DICTIONARY_PBGS_ID_ADV) -t $(DICTIONARY_PBGS_ID_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     56
     57dict_pbgs_log:  $(PABLO_DICTIONARY_PBGS_LOG) # Paralel bitstream based group sorting
     58        python $(PABLO_COMPILER) $(PABLO_DICTIONARY_PBGS_LOG) -t $(DICTIONARY_PBGS_LOG_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     59
     60dict_pbgs_div:  $(PABLO_DICTIONARY_PBGS_DIV) # Paralel bitstream based group sorting
     61        python $(PABLO_COMPILER) $(PABLO_DICTIONARY_PBGS_DIV) -t $(DICTIONARY_PBGS_DIV_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     62
    2163symtab_stl:     $(PABLO_SRCFILE)
    22         python $(PABLO_COMPILER) $(PABLO_SRCFILE) -t $(SYMBOLTABLE_STL_TEMPLATE) -o $(OUTFILE)
     64        python $(PABLO_COMPILER) $(PABLO_SRCFILE) -t $(SYMBOLTABLE_STL_TEMPLATE) -o $(XMLWF_OUTFILE)
    2365
    2466symtab_ls:      $(PABLO_SRCFILE)
    25         python $(PABLO_COMPILER) $(PABLO_SRCFILE) -t $(SYMBOLTABLE_LS_TEMPLATE) -o $(OUTFILE)
     67        python $(PABLO_COMPILER) $(PABLO_SRCFILE) -t $(SYMBOLTABLE_LS_TEMPLATE) -o $(XMLWF_OUTFILE)
    2668
    2769symtab_hash:    $(PABLO_SRCFILE)
    28         python $(PABLO_COMPILER) $(PABLO_SRCFILE) -t $(HASH_SYMBOLTABLE_TEMPLATE) -o $(OUTFILE)
     70        python $(PABLO_COMPILER) $(PABLO_SRCFILE) -t $(HASH_SYMBOLTABLE_TEMPLATE) -o $(XMLWF_OUTFILE)
    2971
    3072symtab_id:      $(PABLO_SYMTAB_ID) # Paralel bitstream based group sorting
    31         python $(PABLO_COMPILER) $(PABLO_FLAGS) $(PABLO_SYMTAB_ID) -t $(SYMBOLTABLE_IDENTITY_TEMPLATE) -o $(OUTFILE)
     73        python $(PABLO_COMPILER) $(PABLO_FLAGS) $(PABLO_SYMTAB_ID) -t $(SYMBOLTABLE_IDENTITY_TEMPLATE) -o $(XMLWF_OUTFILE)
    3274
    3375symtab_pbgs_id: $(PABLO_SYMTAB_PBS) # Paralel bitstream based group sorting
     
    4688        python  $(PABLO_COMPILER) -h
    4789
    48 clean: 
    49         rm -f $(OUTFILE)
     90symtab_clean:
     91        rm -f $(XMLWF_OUTFILE)
    5092
    5193
  • proto/SymbolTable/automate-build_idisa.sh

    r1648 r1666  
    1 make symtab_stl
     1make symtab_div
    22cd src
    33make all
    4 ./xmlwf ../test/test_files/soap.xml
     4./xmlwf ../test/test_files/soap_div2.xml
    55cd ..
    66
  • proto/SymbolTable/src/Makefile

    r1648 r1666  
     1DICT_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
     2DICT_OUTFILE=dictionary
     3
    14SRCFILE=xmlwf.cpp $(SYMTAB_LIB)/bitstream_hash_table.cpp $(SYMTAB_LIB)/hash_symbol_table.cpp $(SYMTAB_LIB)/ls_symbol_table.cxx $(SYMTAB_LIB)/symtab.cxx
    25OUTFILE=xmlwf
     
    2427O1:     $(SRCFILE)
    2528        g++ -O1 -o $(OUTFILE) $(SRCFILE) -march=nocona -m64 -msse2 -DBUFFER_PROFILING  -DPERF_SCRIPT
     29
     30dict:   $(DICT_SRCFILE)
     31        $(CC) $(INCLUDES) -o $(DICT_OUTFILE) $(DICT_SRCFILE) $(AFLAGS)
    2632
    2733all:
  • proto/SymbolTable/symtab_global.h

    r1648 r1666  
    66//typedef long ScanBlock;
    77#define SIMD_type BitBlock
    8 #define DEBUG 0
     8#define DEBUG 1
    99#define SEGMENT_BLOCKS 12
    1010#define BUFFER_SIZE (BLOCK_SIZE * SEGMENT_BLOCKS)
  • proto/SymbolTable/symtab_hash_template.cpp

    r1648 r1666  
    1818int block_base=0;
    1919int buffer_base=0;
    20 int buffer_last;
    2120char * source;
    2221LineColTracker tracker;
Note: See TracChangeset for help on using the changeset viewer.