Changeset 2184

Timestamp:

05/29/12 12:59:28 (12 months ago)

Author:

ksherdy

Message:

Updated Makefile.

Location:

trunk/symbol_table

Files:

• Makefile (modified) (3 diffs)
• templates/main_template.cpp (modified) (5 diffs)

trunk/symbol_table/Makefile

@@ -29 +29 @@
 HASH_OUTFILE=$(PABLO_OUT)/hash_strms.hpp
 
-ID_GROUP_STRMS = $(SYMBOL_TABLE_PABLO_SRC_DIR)/id_group_strms.py
-DIV2_GROUP_STRMS = $(SYMBOL_TABLE_PABLO_SRC_DIR)/div2_group_strms.py
-LOGBASE2_GROUP_STRMS = $(SYMBOL_TABLE_PABLO_SRC_DIR)/logbase2_group_strms.py
-DIV2_LOGBASE2_GROUP_STRMS = $(SYMBOL_TABLE_PABLO_SRC_DIR)/div2_logbase2_group_strms.py
-BIT_BYTE_GROUP_STRMS = $(SYMBOL_TABLE_PABLO_SRC_DIR)/bit_byte_group_strms.py
+ID_GROUP_STRMS_SRC = $(SYMBOL_TABLE_PABLO_SRC_DIR)/id_group_strms.py
+DIV2_GROUP_STRMS_SRC = $(SYMBOL_TABLE_PABLO_SRC_DIR)/div2_group_strms.py
+LOGBASE2_GROUP_STRMS_SRC = $(SYMBOL_TABLE_PABLO_SRC_DIR)/logbase2_group_strms.py
+DIV2_LOGBASE2_GROUP_STRMS_SRC = $(SYMBOL_TABLE_PABLO_SRC_DIR)/div2_logbase2_group_strms.py
+BIT_BYTE_GROUP_STRMS_SRC = $(SYMBOL_TABLE_PABLO_SRC_DIR)/bit_byte_group_strms.py
 
 GROUP_PREFIX=@group_strms_
@@ -51 +51 @@
 #       python $(PABLO_COMPILER) $(MARKER_PABLO_SRC) -t $(TEMPLATE) -l $(MARKER_PREFIX) -o $(TEMP) $(PABLO_ADD_DEBUG)
 #       python $(PABLO_COMPILER) $(HASH_PABLO_SRC) -t $(TEMP) -l $(HASH_PREFIX) -o $(TEMP) $(PABLO_ADD_DEBUG)
-#       python $(PABLO_COMPILER) $(ID_GROUP_STRMS) -t $(TEMP) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
+#       python $(PABLO_COMPILER) $(ID_GROUP_STRMS_SRC) -t $(TEMP) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
 ###########################################################################
@@ -78 +78 @@
         python $(PABLO_COMPILER) $(HASH_PABLO_SRC) -t $(HASH_TEMPLATE) -l $(HASH_PREFIX) -o $(HASH_OUTFILE) $(PABLO_ADD_DEBUG)
 
-id_group: $(ID_GROUP_STRMS) $(GROUP_TEMPLATE) $(MAIN_TEMPLATE)
-        python $(PABLO_COMPILER) $(ID_GROUP_STRMS) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
-        python $(PABLO_COMPILER) $(ID_GROUP_STRMS) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
+id_group: $(ID_GROUP_STRMS_SRC) $(GROUP_TEMPLATE) $(MAIN_TEMPLATE)
+        python $(PABLO_COMPILER) $(ID_GROUP_STRMS_SRC) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
+        python $(PABLO_COMPILER) $(ID_GROUP_STRMS_SRC) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
-div2_group: $(DIV2_GROUP_STRMS) $(GROUP_TEMPLATE) $(MAIN_TEMPLATE)
-        python $(PABLO_COMPILER) $(DIV2_GROUP_STRMS) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
-        python $(PABLO_COMPILER) $(DIV2_GROUP_STRMS) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
+div2_group: $(DIV2_GROUP_STRMS_SRC) $(GROUP_TEMPLATE) $(MAIN_TEMPLATE)
+        python $(PABLO_COMPILER) $(DIV2_GROUP_STRMS_SRC) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
+        python $(PABLO_COMPILER) $(DIV2_GROUP_STRMS_SRC) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
-logbase2_group: $(LOGBASE2_GROUP_STRMS) $(GROUP_TEMPLATE) $(MAIN_TEMPLATE)
-        python $(PABLO_COMPILER) $(LOGBASE2_GROUP_STRMS) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
-        python $(PABLO_COMPILER) $(LOGBASE2_GROUP_STRMS) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
+logbase2_group: $(LOGBASE2_GROUP_STRMS_SRC) $(GROUP_TEMPLATE) $(MAIN_TEMPLATE)
+        python $(PABLO_COMPILER) $(LOGBASE2_GROUP_STRMS_SRC) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
+        python $(PABLO_COMPILER) $(LOGBASE2_GROUP_STRMS_SRC) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
-div2_logbase2_group: $(DIV2_LOGBASE2_GROUP_STRMS) $(GROUP_TEMPLATE) $(MAIN_TEMPLATE)
-        python $(PABLO_COMPILER) $(DIV2_LOGBASE2_GROUP_STRMS) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
-        python $(PABLO_COMPILER) $(DIV2_LOGBASE2_GROUP_STRMS) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
+div2_logbase2_group: $(DIV2_LOGBASE2_GROUP_STRMS_SRC) $(GROUP_TEMPLATE) $(MAIN_TEMPLATE)
+        python $(PABLO_COMPILER) $(DIV2_LOGBASE2_GROUP_STRMS_SRC) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
+        python $(PABLO_COMPILER) $(DIV2_LOGBASE2_GROUP_STRMS_SRC) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
-bit_byte_group: $(BIT_BYTE_GROUP_STRMS) $(GROUP_TEMPLATE) $(MAIN_TEMPLATE)
-        python $(PABLO_COMPILER) $(BIT_BYTE_GROUP_STRMS) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
-        python $(PABLO_COMPILER) $(BIT_BYTE_GROUP_STRMS) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
+bit_byte_group: $(BIT_BYTE_GROUP_STRMS_SRC) $(GROUP_TEMPLATE) $(MAIN_TEMPLATE)
+        python $(PABLO_COMPILER) $(BIT_BYTE_GROUP_STRMS_SRC) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
+        python $(PABLO_COMPILER) $(BIT_BYTE_GROUP_STRMS_SRC) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
 clean:

trunk/symbol_table/templates/main_template.cpp

@@ -145 +145 @@
     ///////////////////////////////////////////////////////////////////////////
     while (chars_avail >= SEGMENT_SIZE) {
-        uint32_t blk;
-        for(blk=0;blk<SEGMENT_BLOCKS;blk++) {
-        s2p_do_block((BytePack *) &src_buffer[blk*BLOCK_SIZE], basis_bits[blk]);    // transpose
-        markers_do_block(basis_bits[blk], markers[blk]);                            // gen symbol spans, mark starts & follows
-        hash_strms_do_block(basis_bits[blk], hash[blk]);                            // gen hash bit streams
-        identity_group_do_block(markers[blk], groups[blk]);                         // sort marker bit stream (identity)
+                uint32_t blk;
+                for(blk=0;blk<SEGMENT_BLOCKS;blk++) {
+                        s2p_do_block((BytePack *) &src_buffer[blk*BLOCK_SIZE], basis_bits[blk]);    // transpose
+                        markers_do_block(basis_bits[blk], markers[blk]);                            // gen symbol spans, mark starts & follows
+                        hash_strms_do_block(basis_bits[blk], hash[blk]);                            // gen hash bit streams
+                        identity_group_do_block(markers[blk], groups[blk]);                         // sort marker bit stream (identity)
     }
 
     for(int blk=0;blk<SEGMENT_BLOCKS;blk++) {   // write contiguous bit streams
-        h0[blk] = hash[blk].h0;
-        h1[blk] = hash[blk].h1;
-        starts[blk] = groups[blk].starts;
-        follows_0[blk] = groups[blk].follows_0;
+                        h0[blk] = hash[blk].h0;
+                        h1[blk] = hash[blk].h1;
+                        starts[blk] = groups[blk].starts;
+                        follows_0[blk] = groups[blk].follows_0;
     }
 
@@ -176 +176 @@
     uint32_t blk_offset;
     for(int blk=0;blk<SEGMENT_BLOCKS;blk++) {
-        blk_offset = blk * BLOCK_SIZE;
-        gid_type gid;
-
-        #ifdef INDEX_AT_STARTS
-            ForwardScanner<BitBlock, scanword_t> scanner(&(groups[blk].starts));
-        #else
-            ForwardScanner<BitBlock, scanword_t> scanner(&(groups[blk].follows));
-        #endif
-
-        scanner.scan_to_next();
-        while(!scanner.is_done()) {
-                gid = gids.at[scanner.get_pos() + blk_offset];
-                cout << string((char *)st.get_raw_data(gid), st.get_lgth(gid)) << ",";
-                scanner.scan_to_next();
-        }
+                        blk_offset = blk * BLOCK_SIZE;
+                        gid_type gid;
+
+                        #ifdef INDEX_AT_STARTS
+                                        ForwardScanner<BitBlock, scanword_t> scanner(&(groups[blk].starts));
+                        #else
+                                        ForwardScanner<BitBlock, scanword_t> scanner(&(groups[blk].follows));
+                        #endif
+
+                        scanner.scan_to_next();
+                        while(!scanner.is_done()) {
+                                gid = gids.at[scanner.get_pos() + blk_offset];
+                                cout << string((char *)st.get_raw_data(gid), st.get_lgth(gid)) << ",";
+                                scanner.scan_to_next();
+                        }
     }
     #endif
@@ -203 +203 @@
     uint32_t blk = 0;
     while (remaining >= BLOCK_SIZE) {
-        s2p_do_block((BytePack *) &src_buffer[blk*BLOCK_SIZE], basis_bits[blk]);
-        markers_do_block(basis_bits[blk], markers[blk]);
-        hash_strms_do_block(basis_bits[blk], hash[blk]);
-        identity_group_do_block(markers[blk], groups[blk]);
-        blk++;
-        remaining -= BLOCK_SIZE;
+                        s2p_do_block((BytePack *) &src_buffer[blk*BLOCK_SIZE], basis_bits[blk]);
+                        markers_do_block(basis_bits[blk], markers[blk]);
+                        hash_strms_do_block(basis_bits[blk], hash[blk]);
+                        identity_group_do_block(markers[blk], groups[blk]);
+                        blk++;
+                        remaining -= BLOCK_SIZE;
     }
 
@@ -215 +215 @@
     ///////////////////////////////////////////////////////////////////////////
     if (remaining > 0 || @marker_strms_any_carry || @group_strms_any_carry /*|| hash_strms_any_carry*/) {
-        BitBlock EOF_mask = bitblock::srl(simd<1>::constant<1>(), convert(BLOCK_SIZE-remaining));
-        s2p_do_final_block((BytePack *) &src_buffer[blk*BLOCK_SIZE], basis_bits[blk], EOF_mask);
-        markers_do_final_block(basis_bits[blk], markers[blk], EOF_mask);
-        hash_strms_do_final_block(basis_bits[blk], hash[blk], EOF_mask);
-        identity_group_do_final_block(markers[blk], groups[blk], EOF_mask);
-        blk++;
+                        BitBlock EOF_mask = bitblock::srl(simd<1>::constant<1>(), convert(BLOCK_SIZE-remaining));
+                        s2p_do_final_block((BytePack *) &src_buffer[blk*BLOCK_SIZE], basis_bits[blk], EOF_mask);
+                        markers_do_final_block(basis_bits[blk], markers[blk], EOF_mask);
+                        hash_strms_do_final_block(basis_bits[blk], hash[blk], EOF_mask);
+                        identity_group_do_final_block(markers[blk], groups[blk], EOF_mask);
+                        blk++;
     }
 
     uint32_t segment_blocks = blk;
     for(int blk=0;blk<segment_blocks;blk++) { // write contiguous hash bit streams
-        h0[blk] = hash[blk].h0;
-        h1[blk] = hash[blk].h1;
-        starts[blk] = groups[blk].starts;
-        follows_0[blk] = groups[blk].follows_0;
+                        h0[blk] = hash[blk].h0;
+                        h1[blk] = hash[blk].h1;
+                        starts[blk] = groups[blk].starts;
+                        follows_0[blk] = groups[blk].follows_0;
     }
 
@@ -239 +239 @@
     uint32_t blk_offset;
     for(int blk=0;blk<segment_blocks;blk++) {
-        blk_offset = blk * BLOCK_SIZE;
-        gid_type gid;
-
-        #ifdef INDEX_AT_STARTS
-            ForwardScanner<BitBlock, scanword_t> scanner(&(groups[blk].starts));
-        #else
-            ForwardScanner<BitBlock, scanword_t> scanner(&(groups[blk].follows));
-        #endif
-
-        scanner.scan_to_next();
-        while(!scanner.is_done()) {
-                gid = gids.at[scanner.get_pos() + blk_offset];
-                cout << string((char *)st.get_raw_data(gid), st.get_lgth(gid)) << ",";
+                blk_offset = blk * BLOCK_SIZE;
+                gid_type gid;
+
+                #ifdef INDEX_AT_STARTS
+                          ForwardScanner<BitBlock, scanword_t> scanner(&(groups[blk].starts));
+                #else
+                          ForwardScanner<BitBlock, scanword_t> scanner(&(groups[blk].follows));
+                #endif
+
                 scanner.scan_to_next();
-        }
+                while(!scanner.is_done()) {
+                        gid = gids.at[scanner.get_pos() + blk_offset];
+                        cout << string((char *)st.get_raw_data(gid), st.get_lgth(gid)) << ",";
+                        scanner.scan_to_next();
+                }
     }
     #endif
 
     #ifdef GID_TEST
-        cout << st.get_max_gid() << endl;
+                        cout << st.get_max_gid() << endl;
     #endif