Changeset 1514 for trunk/lib


Ignore:
Timestamp:
Oct 4, 2011, 5:00:59 PM (8 years ago)
Author:
ksherdy
Message:

ICC defaults to GCC.

Location:
trunk/lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/builtin.hpp

    r1509 r1514  
    3838                return zeroes;
    3939        }
     40
     41/* ICC defaults to GCC */
     42/*
     43#elif defined __INTEL_COMPILER
     44        static IDISA_INLINE long likely(long x) {
     45                return __builtin_expect(x, 1);
     46        }
     47        static IDISA_INLINE long unlikely(long x) {
     48                return __builtin_expect(x, 0);
     49        }
     50        static IDISA_INLINE unsigned long cfzl(unsigned long x) {
     51                return _bit_scan_forward(x);
     52        }
     53        static IDISA_INLINE unsigned long cbzl(unsigned long x) {
     54                return _bit_scan_reverse(int x)
     55        }
     56*/
     57
    4058#elif defined __GNUC__
    4159        static IDISA_INLINE long likely(long x) {
     
    5169                return __builtin_clzl(x);
    5270        }
    53 #elif defined __INTEL_COMPILER
    54         static IDISA_INLINE long likely(long x) {
    55                 return __builtin_expect(x, 1);
    56         }
    57         static IDISA_INLINE long unlikely(long x) {
    58                 return __builtin_expect(x, 0);
    59         }
    60         static IDISA_INLINE unsigned long cfzl(unsigned long x) {
    61                 return _bit_scan_forward(x);
    62         }
    63         static IDISA_INLINE unsigned long cbzl(unsigned long x) {
    64                 return _bit_scan_forward(int x)
    65         }
    6671
    6772#else
  • trunk/lib/config.hpp

    r1510 r1514  
    3131        #elif defined _MSC_VER
    3232                #define IDISA_INLINE          __inline
     33        //      #elif defined __INTEL_COMPILER
     34        //              #define IDISA_INLINE              __inline // ICC defaults to GCC. See, Intel® C++ Compiler User and Reference Guides
    3335        #elif defined __GNUC__
    3436                #define IDISA_INLINE          __inline__
    35         #elif defined __INTEL_COMPILER
    36                 #define IDISA_INLINE              __inline // See, Intel® C++ Compiler User and Reference Guides
    3737        #else
    3838                #define IDISA_INLINE          inline
     
    5252        #elif defined _MSC_VER
    5353                #define IDISA_ALWAYS_INLINE   __forceinline
     54        //      #elif defined __INTEL_COMPILER
     55        //              #define IDISA_ALWAYS_INLINE     __forceinline // ICC defaults to GCC. See, Intel® C++ Compiler User and Reference Guides
    5456        #elif defined __GNUC__
    5557                #define IDISA_ALWAYS_INLINE   __attribute__((always_inline)) IDISA_INLINE
    56         #elif defined __INTEL_COMPILER
    57                 #define IDISA_ALWAYS_INLINE     __forceinline // See, Intel® C++ Compiler User and Reference Guides
    5858        #else
    5959                #define IDISA_ALWAYS_INLINE   IDISA_INLINE
Note: See TracChangeset for help on using the changeset viewer.