- Timestamp:
- May 10, 2012, 11:53:07 AM (7 years ago)
- Location:
- trunk/symbol_table
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/symbol_table/log2_group_strms.py
r2067 r2095 1 # demo2 1 import bitutil as pablo 3 2 -
trunk/symbol_table/main_template.cpp
r2092 r2095 221 221 } 222 222 223 //PERF_SEC_START(parser_timer);223 PERF_SEC_START(parser_timer); 224 224 st.resolve(raw_buffer, groups, starts, ends_gte_17, h0, h1, segment_blocks, gids); 225 //PERF_SEC_END(parser_timer, chars_avail+1);225 PERF_SEC_END(parser_timer, chars_avail+1); 226 226 227 227 #ifdef IDENTITY_TEST -
trunk/symbol_table/src/Makefile
r2092 r2095 1 CC= g++ $(CFLAGS) # -g # -O31 CC= g++ $(CFLAGS) -O3 # -g 2 2 SSE=-msse2 #-mssse3 #-msse4.2 3 3 CFLAGS= $(SSE) … … 14 14 15 15 TEST_SCRIPT = ../test/run_tests.py 16 TEST_PRGM = main17 16 TEST_SRC_DIR = ../test/in 18 17 TEST_DST_DIR = ../test/out 19 18 20 19 id: basis_bits.hpp buffer.hpp byte_pool.hpp hash_strms.hpp hash_table.hpp ../lib/hash.hpp group_strms.hpp symbol_table.hpp main.cpp marker_strms.hpp symbol_table.hpp transpose.hpp 21 $(CC) -o main main.cpp $(AFLAGS) -DID_STRATEGY -DGID_TEST #-DIDENTITY_TEST #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG -DHASH_TABLE_HPP_DEBUG # -DBUFFER_PROFILING20 $(CC) -o id main.cpp $(AFLAGS) -DID_STRATEGY -DBUFFER_PROFILING #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG #-DHASH_TABLE_HPP_DEBUG 22 21 23 22 div2: basis_bits.hpp buffer.hpp byte_pool.hpp hash_strms.hpp hash_table.hpp ../lib/hash.hpp group_strms.hpp symbol_table.hpp main.cpp marker_strms.hpp symbol_table.hpp transpose.hpp 24 $(CC) -o main main.cpp $(AFLAGS) -DDIV2_STRATEGY -DGID_TEST #-DIDENTITY_TEST #-DHASH_TABLE_HPP_DEBUG #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG -DBUFFER_PROFILING23 $(CC) -o div2 main.cpp $(AFLAGS) -DDIV2_STRATEGY -DBUFFER_PROFILING #-DHASH_TABLE_HPP_DEBUG #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG 25 24 26 25 logbase2: basis_bits.hpp buffer.hpp byte_pool.hpp hash_strms.hpp hash_table.hpp ../lib/hash.hpp group_strms.hpp symbol_table.hpp main.cpp marker_strms.hpp symbol_table.hpp transpose.hpp 27 $(CC) -o main main.cpp $(AFLAGS) -DLOG2_STRATEGY -DIDENTITY_TEST #-DGID_TEST #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG #-DHASH_TABLE_HPP_DEBUG # -DBUFFER_PROFILING26 $(CC) -o logbase2 main.cpp $(AFLAGS) -DLOG2_STRATEGY -DBUFFER_PROFILING #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG #-DHASH_TABLE_HPP_DEBUG 28 27 29 diff_test: main 30 python $(TEST_SCRIPT) $(TEST_PRGM) -d 28 id_diff_test: id 29 $(CC) -o id main.cpp $(AFLAGS) -DID_STRATEGY -DIDENTITY_TEST 30 python $(TEST_SCRIPT) id -d 31 31 diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0 32 32 33 gid_test: 34 python $(TEST_SCRIPT) $(TEST_PRGM) -g 33 div2_diff_test: div2 34 $(CC) -o div2 main.cpp $(AFLAGS) -DDIV2_STRATEGY -DIDENTITY_TEST 35 python $(TEST_SCRIPT) div2 -d 36 diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0 37 38 logbase2_diff_test: logbase2 39 $(CC) -o logbase2 main.cpp $(AFLAGS) -DLOG2_STRATEGY -DIDENTITY_TEST 40 python $(TEST_SCRIPT) logbase2 -d 41 diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0 42 43 id_gid_test: 44 $(CC) -o id main.cpp $(AFLAGS) -DID_STRATEGY -DGID_TEST 45 python $(TEST_SCRIPT) id -g 46 47 div2_gid_test: 48 $(CC) -o div2 main.cpp $(AFLAGS) -DDIV2_STRATEGY -DGID_TEST 49 python $(TEST_SCRIPT) div2 -g 50 51 logbase2_gid_test: 52 $(CC) -o logbase2 main.cpp $(AFLAGS) -DLOG2_STRATEGY -DGID_TEST 53 python $(TEST_SCRIPT) logbase2 -g 35 54 36 55 clean: 37 rm -Rf main$(TEST_DST_DIR)56 rm -Rf id div2 logbase2 $(TEST_DST_DIR) 38 57 -
trunk/symbol_table/src/buffer.hpp
r2062 r2095 9 9 #define LOOKBACK_BLOCKS 1 10 10 #define LOOKBACK_SIZE BLOCK_SIZE * LOOKBACK_BLOCKS 11 #define SEGMENT_BLOCKS 1000 // No COPY BACK for test, starts within segment11 #define SEGMENT_BLOCKS 5000 // No COPY BACK for test, starts within segment 12 12 #define SEGMENT_SIZE BLOCK_SIZE * (SEGMENT_BLOCKS) // (bytes) a multiple of BLOCK_SIZE 13 13 #define SEGMENT_ALLOC_SIZE (LOOKBACK_SIZE + SEGMENT_SIZE + PADDING_SIZE) / sizeof(BitBlock) // (bytes) -
trunk/symbol_table/src/compare_strategy.hpp
r2092 r2095 148 148 }; 149 149 150 /////////////////////////////////////////////////////////////////////////////// 151 // Log base 2 specialized 152 /////////////////////////////////////////////////////////////////////////////// 150 153 template<> class compare_strategy_t<1,logbase2> { 151 154 public: 152 155 static IDISA_ALWAYS_INLINE bool compare(uint8_t * x, uint8_t * y, const uint32_t lgth) { 153 //return mem_compare(x,y,lgth); // TODO review154 156 return overlap_compare<uint8_t>(x,y,lgth); 155 157 } … … 159 161 public: 160 162 static IDISA_ALWAYS_INLINE bool compare(uint8_t * x, uint8_t * y, const uint32_t lgth) { 161 //return mem_compare(x,y,lgth); // TODO review162 163 return overlap_compare<uint8_t>(x,y,lgth); 163 164 } … … 167 168 public: 168 169 static IDISA_ALWAYS_INLINE bool compare(uint8_t * x, uint8_t * y, const uint32_t lgth) { 169 //return mem_compare(x,y,lgth); // TODO review170 170 return overlap_compare<uint16_t>(x,y,lgth); 171 171 } … … 175 175 public: 176 176 static IDISA_ALWAYS_INLINE bool compare(uint8_t * x, uint8_t * y, const uint32_t lgth) { 177 //return mem_compare(x,y,lgth); // TODO review178 177 return overlap_compare<uint32_t>(x,y,lgth); 179 178 } … … 183 182 public: 184 183 static IDISA_ALWAYS_INLINE bool compare(uint8_t * x, uint8_t * y, const uint32_t lgth) { 185 //return mem_compare(x,y,lgth); // TODO review186 184 return overlap_compare<uint64_t>(x,y,lgth); 187 185 } -
trunk/symbol_table/symbol_table.pro
r2092 r2095 53 53 test/uniform/st_test_UNIFORM_(5_1_1)_(6_1_1)_(7_1_1)_(8_1_1)_(9_1_1)_(10_1_1)_1_1 \ 54 54 test/run_tests.py \ 55 test/uniform/[1_100_10][2_100_10][3_100_10][4_100_10][5_100_10][6_100_10][7_100_10][8_100_10][9_100_10][10_100_10][11_100_10][12_100_10][13_100_10][14_100_10][15_100_10][16_100_10][17_100_10][18_100_10][19_100_10]_1_1.test 55 test/uniform/[1_100_10][2_100_10][3_100_10][4_100_10][5_100_10][6_100_10][7_100_10][8_100_10][9_100_10][10_100_10][11_100_10][12_100_10][13_100_10][14_100_10][15_100_10][16_100_10][17_100_10][18_100_10][19_100_10]_1_1.test \ 56 test/gen_test_file.py 56 57 HEADERS += marker_strms_template.hpp \ 57 58 marker_strms.hpp \ … … 84 85 lib/bitblock128.hpp \ 85 86 lib/bitblock.hpp \ 86 src/types.hpp 87 src/types.hpp \ 88 lib/debug.hpp \ 89 lib/bitblock_align.hpp -
trunk/symbol_table/test/st_test_file_generator.py
r2092 r2095 229 229 base_filename = "" 230 230 for lst in symbol_specs: 231 base_filename += "(" + str(lst[0]) + "_" + str(lst[1]) + "_" + str(lst[2]) + ") "232 base_filename += "_" +str(arguments[num_args-2]) + "_" + str(arguments[num_args-1])231 base_filename += "(" + str(lst[0]) + "_" + str(lst[1]) + "_" + str(lst[2]) + ")_" 232 base_filename += str(arguments[num_args-2]) + "_" + str(arguments[num_args-1]) 233 233 234 234 # calculate total symbol count
Note: See TracChangeset
for help on using the changeset viewer.