Changeset 3922 for trunk


Ignore:
Timestamp:
Jul 22, 2014, 5:01:09 PM (4 years ago)
Author:
linmengl
Message:

copy xmlwf in and compile it with ir lib

Location:
trunk/lib_ir
Files:
25 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib_ir

    • Property svn:externals set to
  • trunk/lib_ir/CMakeLists.txt

    r3918 r3922  
    1212add_executable(test_link test_link.cpp s2p_optimized.o)
    1313add_executable(test_pack test_pack.cpp s2p_optimized.o)
     14
     15include_directories("xmlwf/util" "xmlwf/lib")
     16add_executable(xmlwf xmlwf/src/xmlwf.cpp s2p_optimized.o)
    1417
    1518# compile s2p.ll, and make sure test_s2p depends on it.
     
    3033  NAME ctest_pack
    3134  COMMAND ./test_pack)
     35add_test(
     36  NAME ctest_xmlwf
     37  COMMAND python ${PROJECT_SOURCE_DIR}/xmlwf/run_all.py)
    3238
    3339add_custom_target (check
    3440  COMMAND ${CMAKE_CTEST_COMMAND}
    35   DEPENDS test_s2p test_link test_pack)
     41  DEPENDS test_s2p test_link test_pack xmlwf)
  • trunk/lib_ir/s2p.h

    r3920 r3922  
    3131}
    3232
     33#define S2P_ALGORITHM s2p_bytepack
     34
    3335#define s2p_bytepack(s0, s1, s2, s3, s4, s5, s6, s7, p0, p1, p2, p3, p4, p5, p6, p7) \
    3436  do {\
     
    5153  } while(0)
    5254
     55#define s2p(s0, s1, s2, s3, s4, s5, s6, s7, p0, p1, p2, p3, p4, p5, p6, p7)\
     56  S2P_ALGORITHM(s7, s6, s5, s4, s3, s2, s1, s0, p0, p1, p2, p3, p4, p5, p6, p7)
     57
    5358#endif
  • trunk/lib_ir/test_pack.cpp

    r3920 r3922  
    11#include "utility.h"
    22#include "s2p.h"
    3 #include "s2p.hpp"
     3#include "s2p_back.hpp"
    44#include <iostream>
    55#include <cstdlib>
  • trunk/lib_ir/transpose.hpp

    r3909 r3922  
    33
    44#include "bitblock.hpp"
    5 #include "s2p.hpp"
     5#include "s2p.h"
    66
    77#ifdef BASIS_BITS
Note: See TracChangeset for help on using the changeset viewer.