Changeset 2178 for trunk/symbol_table


Ignore:
Timestamp:
May 28, 2012, 3:23:08 PM (7 years ago)
Author:
ksherdy
Message:

Restructuring.

Location:
trunk/symbol_table
Files:
2 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/symbol_table/Makefile

    r2174 r2178  
    1414
    1515PABLO_SRC=pablo
     16PABLO_OUT=pablo_out
    1617#PABLO_COMPILER=../../proto/Compiler/pablomain.py
    1718PABLO_COMPILER=Compiler/pablomain.py
     
    2122MARKER_PABLO_SRC=$(PABLO_SRC)/marker_strms.py
    2223MARKER_TEMPLATE=marker_strms_template.hpp
    23 MARKER_OUTFILE=src/marker_strms.hpp
     24MARKER_OUTFILE=$(PABLO_OUT)/marker_strms.hpp
    2425
    2526HASH_PREFIX=@hash_strms_
    2627HASH_PABLO_SRC=$(PABLO_SRC)/hash_strms.py
    2728HASH_TEMPLATE=hash_strms_template.hpp
    28 HASH_OUTFILE=src/hash_strms.hpp
     29HASH_OUTFILE=$(PABLO_OUT)/hash_strms.hpp
    2930
    3031ID_GROUP_STRMS = $(PABLO_SRC)/id_group_strms.py
     
    3637GROUP_PREFIX=@group_strms_
    3738GROUP_TEMPLATE=group_strms_template.hpp
    38 GROUP_OUTFILE=src/group_strms.hpp
     39GROUP_OUTFILE=$(PABLO_OUT)/group_strms.hpp
    3940
    4041MAIN_TEMPLATE=main_template.cpp
    41 MAIN_OUTFILE=src/main.cpp
     42MAIN_OUTFILE=$(PABLO_OUT)/main.cpp
    4243
    4344TEMPLATE=template.cpp
     
    5657###########################################################################
    5758
    58 id: markers hash id_group src/main.cpp
     59id: markers hash id_group $(PABLO_OUT)/main.cpp
    5960        python $(PABLO_COMPILER) $(MARKER_PABLO_SRC) -t $(MAIN_OUTFILE) -l $(MARKER_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
    6061
    61 div2: markers $(MARKER_PABLO_SRC) src/main.cpp
     62div2: markers $(MARKER_PABLO_SRC) $(PABLO_OUT)/main.cpp
    6263        python $(PABLO_COMPILER) $(MARKER_PABLO_SRC) -t $(MAIN_OUTFILE) -l $(MARKER_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
    6364
    64 logbase2: $(MARKER_PABLO_SRC)_group src/main.cpp
     65logbase2: $(MARKER_PABLO_SRC)_group $(PABLO_OUT)/main.cpp
    6566        python $(PABLO_COMPILER) $(MARKER_PABLO_SRC) -t $(MAIN_OUTFILE) -l $(MARKER_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
    6667
    67 div2_logbase2: $(MARKER_PABLO_SRC) src/main.cpp
     68div2_logbase2: $(MARKER_PABLO_SRC) $(PABLO_OUT)/main.cpp
    6869        python $(PABLO_COMPILER) $(MARKER_PABLO_SRC) -t $(MAIN_OUTFILE) -l $(MARKER_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
    6970
    70 bit_byte: $(MARKER_PABLO_SRC)_group src/main.cpp
     71bit_byte: $(MARKER_PABLO_SRC)_group $(PABLO_OUT)/main.cpp
    7172        python $(PABLO_COMPILER) $(MARKER_PABLO_SRC) -t $(MAIN_OUTFILE) -l $(MARKER_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
    7273
  • trunk/symbol_table/hash_strms_template.hpp

    r2158 r2178  
    44#include "../lib/bitblock.hpp"
    55#include "../lib/carryQ.hpp"
    6 #include "basis_bits.hpp"
     6#include "../src/basis_bits.hpp"
    77
    88// GENERATED
  • trunk/symbol_table/main_template.cpp

    r2169 r2178  
    2828#include "../lib/s2p.hpp"
    2929#include "../lib/perflib/perfsec.h"
    30 #include "transpose.hpp"
     30#include "../src/transpose.hpp"
    3131
    3232#include "marker_strms.hpp"     // GENERATED HEADER
     
    3939using namespace std;
    4040
    41 #include "symbol_table.hpp"
     41#include "../src/symbol_table.hpp"
    4242
    4343#ifdef BUFFER_PROFILING
  • trunk/symbol_table/src/symbol_table.hpp

    r2150 r2178  
    2424#define ID_SYMBOL_TABLE_TEMPLATE_HPP
    2525
     26#include "../lib/buffer.hpp"
     27#include "../lib/bitblock_iterator.hpp"
     28#include "../lib/bitblock_scan.hpp"
    2629#include "strategy_types.hpp"
    2730#include "gid.hpp"
    2831#include "hash_table.hpp"
    29 #include "../lib/buffer.hpp"
    30 #include "../lib/bitblock_iterator.hpp"
    31 #include "../lib/bitblock_scan.hpp"
    3232#include <cstdlib>
    3333#include <vector>
  • trunk/symbol_table/test/run_tests.py

    r2141 r2178  
    1010#----------------------------------------------------------------------------
    1111# Edit:
    12 program_dir_path='../src'
     12program_dir_path='../pablo_out'
    1313test_dir_path='../test/pin'
    1414out_dir_path='../test/pout'
Note: See TracChangeset for help on using the changeset viewer.