Changeset 2280 for proto/parabix2


Ignore:
Timestamp:
Aug 7, 2012, 7:32:26 PM (7 years ago)
Author:
ksherdy
Message:

Updated include path and Makefile.

Location:
proto/parabix2
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • proto/parabix2/pablo_template.cpp

    r2206 r2280  
    88CarryArray<count, 0> name;\
    99
    10 #include "../lib/bitblock.hpp"
    11 #include "../lib/carryQ.hpp"
    12 #include "../lib/bitstream_iterator.hpp"
    13 #include "../lib/bitblock_iterator.hpp"
    14 #include "../lib/s2p.hpp"
    15 #include "../lib/perflib/perfsec.h"
     10#include "../lib/simd-lib/bitblock.hpp"
     11#include "../lib/simd-lib/carryQ.hpp"
     12#include "../lib/simd-lib/bitstream_iterator.hpp"
     13#include "../lib/simd-lib/bitblock_iterator.hpp"
     14#include "../lib/simd-lib/s2p.hpp"
     15#include "../lib/simd-lib/perflib/perfsec.h"
    1616
    1717#include <xmldecl.h>
     
    6565// Headers that depend @ global stream struct types.
    6666//////////////////////////////////////////////////////////////////////////////////////////
    67 #include "../lib/transpose.hpp"
     67#include "../lib/simd-lib/transpose.hpp"
    6868#include <post_process.hpp>
    6969
     
    135135        //      uint8_t * src_buffer = (uint8_t *)buf + COPYBACK_SIZE;
    136136
    137         #include "../lib/buffer.hpp"
     137        #include "../lib/simd-lib/buffer.hpp"
    138138        uint8_t * COPYBACK;
    139139        uint8_t * src_buffer;
  • proto/parabix2/pablo_template_avx.cpp

    r1761 r2280  
    99#define SEGMENT_BLOCKS 12
    1010#define BUFFER_SIZE (BLOCK_SIZE * SEGMENT_BLOCKS)
    11 #define OVERLAP_BUFSIZE (sizeof(SIMD_type))
     11#define OVERLAP_BUFSIZE (sizeof(SIMD_type))simd-lib/
    1212
    1313#include "xmldecl.h"
    1414#include "namechars.h"
    15 #include "../lib/bitblock.hpp"
    16 #include "../lib/carryQ_avx.h"
    17 #include "../lib/perflib/perfsec.h"
    18 #include "../lib/s2p.hpp"
     15#include "../lib/simd-lib/bitblock.hpp"
     16#include "../lib/simd-lib/carryQ_avx.h"
     17#include "../lib/simd-lib/perflib/perfsec.h"
     18#include "../lib/simd-lib/s2p.hpp"
    1919
    2020#include "TagMatcher_avx.h"
  • proto/parabix2/pablo_template_symbol_table.cpp

    r2211 r2280  
    88CarryArray<count, 0> name;\
    99
    10 #include "../lib/bitblock.hpp"
    11 #include "../lib/carryQ.hpp"
    12 #include "../lib/bitstream_iterator.hpp"
    13 #include "../lib/bitblock_iterator.hpp"
    14 #include "../lib/s2p.hpp"
    15 #include "../lib/perflib/perfsec.h"
     10#include <simd-lib/bitblock.hpp>
     11#include <simd-lib/carryQ.hpp>
     12#include <simd-lib/bitstream_iterator.hpp>
     13#include <simd-lib/bitblock_iterator.hpp>
     14#include <simd-lib/s2p.hpp>
     15#include "../lib/simd-lib/perflib/perfsec.h"
    1616
    1717#include <xmldecl.h>
     
    8181// Headers that depend @ global stream struct types.
    8282//////////////////////////////////////////////////////////////////////////////////////////
    83 #include "../lib/transpose.hpp"
     83#include "../lib/simd-lib/transpose.hpp"
    8484#include <post_process.hpp>
    8585
     
    156156        //      uint8_t * src_buffer = (uint8_t *)buf + COPYBACK_SIZE;
    157157
    158         #include "../lib/buffer.hpp"
     158        #include <simd-lib/buffer.hpp>
    159159        uint8_t * COPYBACK;
    160160        uint8_t * src_buffer;
  • proto/parabix2/src/Makefile

    r2214 r2280  
    1313CFLAGS= $(SSE) -O3
    1414SSE=-msse2 #-msse4.1 -DUSE_PTEST #-mssse3 -msse4.1 -msse4.2
    15 INCLUDES=../util
     15INCLUDES=-I../util -I../lib/
    1616
    1717PAPI_DIR=/usr/local/papi
     
    2929
    3030avx:    $(SRCFILE)
    31         $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) -march=nocona -m64 -mavx
     31        $(CC) -o $(OUTFILE) $(SRCFILE) $(INCLUDES) -march=nocona -m64 -mavx
    3232
    3333all:    $(SRCFILE)
    34         $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS)
     34        $(CC) -o $(OUTFILE) $(SRCFILE) $(INCLUDES) $(AFLAGS)
    3535
    3636threads:        $(SRCFILE)
    37         g++ -O3 -msse2 -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -lpthread -DBUFFER_PROFILING
     37        g++ -O3 -msse2 -o $(OUTFILE) $(SRCFILE) $(INCLUDES) $(AFLAGS) -lpthread -DBUFFER_PROFILING
    3838
    3939papi_profiling: $(SRCFILE)
    40         $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS) $(CODE_CLOCKER)
     40        $(CC) -o $(OUTFILE) $(SRCFILE) $(INCLUDES) $(AFLAGS) $(CODE_CLOCKER)
    4141
    4242buffer_profiling: $(SRCFILE)
    43         $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DBUFFER_PROFILING
     43        $(CC) -o $(OUTFILE) $(SRCFILE) $(INCLUDES) $(AFLAGS) -DBUFFER_PROFILING
    4444       
    4545as: $(OUTFILE).s
     
    5959
    6060asm:  $(SRCFILE)
    61         $(CC) -o $(OUTFILE).s $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -S -fverbose-asm
     61        $(CC) -o $(OUTFILE).s $(SRCFILE) $(INCLUDES) $(AFLAGS) -S -fverbose-asm
    6262
    6363# Symbol Table perf targets
     
    6666
    6767buffer_profiling_perf: $(SRCFILE)
    68         $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DBUFFER_PROFILING  -DPERF_SCRIPT
     68        $(CC) -o $(OUTFILE) $(SRCFILE) $(INCLUDES) $(AFLAGS) -DBUFFER_PROFILING  -DPERF_SCRIPT
    6969
    7070id_profiling_perf: $(ID_SRCFILE)
    71         $(CC) -o id $(ID_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DID_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
     71        $(CC) -o id $(ID_SRCFILE) $(INCLUDES) $(AFLAGS) -DID_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
    7272
    7373div2_profiling_perf: $(DIV2_SRCFILE)
    74         $(CC) -o div2 $(DIV2_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DDIV2_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
     74        $(CC) -o div2 $(DIV2_SRCFILE) $(INCLUDES) $(AFLAGS) -DDIV2_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
    7575
    7676logbase2_profiling_perf: $(LOGBASE2_SRCFILE)
    77         $(CC) -o logbase2 $(LOGBASE2_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DLOGBASE2_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
     77        $(CC) -o logbase2 $(LOGBASE2_SRCFILE) $(INCLUDES) $(AFLAGS) -DLOGBASE2_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
    7878
    7979div2_logbase2_profiling_perf: $(DIV2_LOGBASE2_SRCFILE)
    80         $(CC) -o div2_logbase2 $(DIV2_LOGBASE2_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DDIV2_LOGBASE2_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
     80        $(CC) -o div2_logbase2 $(DIV2_LOGBASE2_SRCFILE) $(INCLUDES) $(AFLAGS) -DDIV2_LOGBASE2_STRATEGY -DBUFFER_PROFILING -DPERF_SCRIPT
    8181
    8282bit_byte_profiling_perf: $(BIT_BYTE_SRCFILE)
    83         $(CC) -o bit_byte $(BIT_BYTE_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DBIT_BYTE_STRATEGY -DBUFFER_PROFILING  -DPERF_SCRIPT
     83        $(CC) -o bit_byte $(BIT_BYTE_SRCFILE) $(INCLUDES) $(AFLAGS) -DBIT_BYTE_STRATEGY -DBUFFER_PROFILING  -DPERF_SCRIPT
    8484
    8585# Symbol Table debug targets
     
    8888
    8989id_debug: $(ID_SRCFILE)
    90         $(CC) -o id $(ID_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DID_STRATEGY  -DDUMP_SYMBOLS
     90        $(CC) -o id $(ID_SRCFILE) $(INCLUDES) $(AFLAGS) -DID_STRATEGY  -DDUMP_SYMBOLS
    9191
    9292div2_debug: $(DIV2_SRCFILE)
    93         $(CC) -o div2 $(DIV2_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DDIV2_STRATEGY -DDUMP_SYMBOLS
     93        $(CC) -o div2 $(DIV2_SRCFILE) $(INCLUDES) $(AFLAGS) -DDIV2_STRATEGY -DDUMP_SYMBOLS
    9494
    9595logbase2_debug: $(LOGBASE2_SRCFILE)
    96         $(CC) -o logbase2 $(LOGBASE2_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DLOGBASE2_STRATEGY -DDUMP_SYMBOLS
     96        $(CC) -o logbase2 $(LOGBASE2_SRCFILE) $(INCLUDES) $(AFLAGS) -DLOGBASE2_STRATEGY -DDUMP_SYMBOLS
    9797
    9898div2_logbase2_debug: $(DIV2_LOGBASE2_SRCFILE)
    99         $(CC) -o div2_logbase2 $(DIV2_LOGBASE2_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DDIV2_LOGBASE2_STRATEGY -DDUMP_SYMBOLS
     99        $(CC) -o div2_logbase2 $(DIV2_LOGBASE2_SRCFILE) $(INCLUDES) $(AFLAGS) -DDIV2_LOGBASE2_STRATEGY -DDUMP_SYMBOLS
    100100
    101101bit_byte_debug: $(BIT_BYTE_SRCFILE)
    102         $(CC) -o bit_byte $(BIT_BYTE_SRCFILE) -I$(INCLUDES) $(AFLAGS) -DBIT_BYTE_STRATEGY -DDUMP_SYMBOLS
     102        $(CC) -o bit_byte $(BIT_BYTE_SRCFILE) $(INCLUDES) $(AFLAGS) -DBIT_BYTE_STRATEGY -DDUMP_SYMBOLS
    103103
  • proto/parabix2/util/ErrorTracker.h

    r2172 r2280  
    99#define ERRORTRACKER_H_
    1010
    11 #include "../lib/bitblock.hpp"
     11#include "../lib/simd-lib/bitblock.hpp"
    1212#include "ErrorUtil.h"
    1313
  • proto/parabix2/util/LineColTracker.hpp

    r2171 r2280  
    66*/
    77
    8 #include "../lib/bitblock.hpp"
     8#include "../lib/simd-lib/bitblock.hpp"
    99
    1010static inline void bitwise_half_add(BitBlock x, BitBlock y, BitBlock &sum, BitBlock &carry){
  • proto/parabix2/util/TagMatcher.hpp

    r2172 r2280  
    22#define TAGMATCHER_HPP_
    33
    4 #include "../lib/bitblock.hpp"
     4#include "../lib/simd-lib/bitblock.hpp"
    55
    66#include <algorithm>
Note: See TracChangeset for help on using the changeset viewer.