Changeset 3683


Ignore:
Timestamp:
Mar 15, 2014, 12:08:15 AM (5 years ago)
Author:
ksherdy
Message:

Updated PabloJ name to s2k.

Location:
proto/parabix2
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • proto/parabix2/Makefile

    r2931 r3683  
    11OUTFILE=src/xmlwf.cpp
    2 OUTFILEJ=src/xmlwfj.cpp
     2S2K_OUTFILE=src/s2k_xmlwf.cpp
    33ID_OUTFILE=src/id.cpp
    44DIV2_OUTFILE=src/div2.cpp
     
    1414PABLO_ADD_DEBUG = # -a -b
    1515
    16 PABLO_TEMPLATEJ=pabloj_template.cpp
     16S2K_TEMPLATE=s2k_template.cpp
    1717
    1818# LSST
     
    4444        python $(PABLO_COMPILER) $(PABLO_SRC) -t $(PABLO_TEMPLATE) -o $(OUTFILE) $(PABLO_ADD_DEBUG)
    4545
    46 xmlwfj: $(PABLO_SRC)
    47         python $(PABLO_COMPILER) $(PABLO_SRC) -t $(PABLO_TEMPLATEJ) -o $(OUTFILEJ) $(PABLO_ADD_DEBUG)
     46s2k_xmlwf:      $(PABLO_SRC)
     47        python $(PABLO_COMPILER) $(PABLO_SRC) -t $(S2K_TEMPLATE) -o $(S2K_OUTFILE) $(PABLO_ADD_DEBUG)
    4848
    4949experimental:   $(PABLO_SRC)
     
    8080
    8181clean: 
    82         rm -f $(OUTFILE) $(OUTFILEJ) $(ID_OUTFILE) $(DIV2_OUTFILE) $(LOGBASE2_OUTFILE) $(DIV2_LOGBASE2_OUTFILE) $(BIT_BYTE_OUTFILE) $(TEMP)
     82        rm -f $(OUTFILE) $(S2k_OUTFILE) $(ID_OUTFILE) $(DIV2_OUTFILE) $(LOGBASE2_OUTFILE) $(DIV2_LOGBASE2_OUTFILE) $(BIT_BYTE_OUTFILE) $(TEMP)
    8383
    8484
  • proto/parabix2/s2k_template.cpp

    r3679 r3683  
    11// PabloJ generated headers
    2 #include "/home/ken/workspace/pabloj/output/cpplang/pablo_definitions.hpp"
     2#include "/home/ken/workspace/pabloj/output/cpplang/parabix2_pablo_definitions.hpp"
    33
    44// CPP standard headers
  • proto/parabix2/src/Makefile

    r3521 r3683  
    22SRCFILE=xmlwf.cpp
    33
    4 OUTFILEJ=xmlwfj
    5 SRCFILEJ=xmlwfj.cpp
     4S2K_OUTFILE=s2k_xmlwf
     5S2K_SRCFILE=s2k_xmlwf.cpp
    66
    77TEST=run_all.py
     
    4040        $(CC) -DBLOCK_SIZE=256 -DUSE_AVX -o $(OUTFILE) $(SRCFILE) $(INCLUDES) -march=nocona -m64 -mavx
    4141
    42 all:    $(SRCFILE)
     42xmlwf:  $(SRCFILE)
    4343        $(CC) -o $(OUTFILE) $(SRCFILE) $(INCLUDES) $(AFLAGS)
    4444
    45 xmlwfj: $(SRCFILEJ)
    46         $(CC) -o $(OUTFILEJ) $(SRCFILEJ) $(INCLUDES) $(AFLAGS)
     45s2k_xmlwf: $(S2K_SRCFILE)
     46        $(CC) -o $(S2K_OUTFILE) $(S2K_SRCFILE) $(INCLUDES) $(AFLAGS)
    4747
    4848threads:        $(SRCFILE)
     
    5555        $(CC) -o $(OUTFILE) $(SRCFILE) $(INCLUDES) $(AFLAGS) -DBUFFER_PROFILING
    5656       
    57 buffer_profilingj: $(SRCFILEJ)
    58         $(CC) -o $(OUTFILEJ) $(SRCFILEJ) $(INCLUDES) $(AFLAGS) -DBUFFER_PROFILING
     57s2k_buffer_profiling: $(S2K_SRCFILE)
     58        $(CC) -o $(S2K_OUTFILE) $(S2K_SRCFILE) $(INCLUDES) $(AFLAGS) -DBUFFER_PROFILING
    5959
    6060as: $(OUTFILE).s
     
    7171
    7272clean: 
    73         rm -f $(OUTFILE) $(OUTFILE).s $(OUTFILE).o id div2 logbase2 div2_logbase2 bit_byte $(OUTFILEJ)
     73        rm -f $(OUTFILE) $(OUTFILE).s $(OUTFILE).o id div2 logbase2 div2_logbase2 bit_byte $(S2K_OUTFILE)
    7474
    7575asm:  $(SRCFILE)
  • proto/parabix2/src/run_all.py

    r3454 r3683  
    1313output_files = output_home+"/Files"
    1414output_messages = output_home+"/Messages"
    15 program_to_test = "xmlwf"
     15program_to_test = "s2k_xmlwf"
    1616edition5_program_to_test = 'markup_stats_5e'
    1717testcases = []
Note: See TracChangeset for help on using the changeset viewer.