Merge pull request #1247 from martin-frbg/revert-cgroups-pr

Revert #1246, "honor cgroup/cpuset limits" for now
Revert #1246 , "honor cgroup/cpuset limits" for now
2017-07-25 16:09:55 +08:00 · 2017-07-25 08:39:35 +02:00
10146 changed files with 138431 additions and 2661290 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,139 +0,0 @@
-macos_instance:
-  image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
-
-task:
-  name: AppleM1/LLVM
-  compile_script:
-  - brew install llvm
-  - export PATH=/opt/homebrew/opt/llvm/bin:$PATH
-  - export LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
-  - export CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
-  - make TARGET=VORTEX USE_OPENMP=1 CC=clang
-
-task:
-  name: AppleM1/LLVM/ILP64
-  compile_script:
-  - brew install llvm
-  - export PATH=/opt/homebrew/opt/llvm/bin:$PATH
-  - export LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
-  - export CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
-  - make TARGET=VORTEX USE_OPENMP=1 CC=clang INTERFACE64=1
-
-task:
-  name: AppleM1/LLVM/CMAKE
-  compile_script:
-  - brew install llvm
-  - export PATH=/opt/homebrew/opt/llvm/bin:$PATH
-  - export LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
-  - export CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
-  - mkdir build
-  - cd build
-  - cmake -DTARGET=VORTEX -DCMAKE_C_COMPILER=clang -DBUILD_SHARED_LIBS=ON ..
-  - make
-  
-macos_instance:
-  image: ghcr.io/cirruslabs/macos-monterey-xcode:13.4
-task:
-  name: AppleM1/LLVM x86_64 xbuild
-  compile_script:
-  - #brew install llvm
-  - export #PATH=/opt/homebrew/opt/llvm/bin:$PATH
-  - export #LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
-  - export #CPPFLAGS="-I/opt/homebrew/opt/llvm/include" 
-  - export ARCHS="i386 x86_64"
-  - export ARCHS_STANDARD="i386 x86_64"
-  - export ARCHS_STANDARD_32_64_BIT="i386 x86_64"
-  - export ARCHS_STANDARD_64_BIT=x86_64
-  - export ARCHS_STANDARD_INCLUDING_64_BIT="i386 x86_64"
-  - export ARCHS_UNIVERSAL_IPHONE_OS="i386 x86_64"
-  - export VALID_ARCHS="i386 x86_64"
-  - #find /Applications/Xcode-13.4.1.app -name libunwind.dylib
-  - export CC=/Applications/Xcode-13.4.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
-  - export CFLAGS="-O2 -unwindlib=none -Wno-macro-redefined -isysroot /Applications/Xcode-13.4.1.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator15.5.sdk -arch x86_64 -miphoneos-version-min=10.0"
-  - make TARGET=CORE2 DYNAMIC_ARCH=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1
-  always:
-    config_artifacts:
-      path: "*conf*"
-      type: text/plain
-#  lib_artifacts:
-#    path: "libopenblas*"
-#    type: application/octet-streamm
-
-macos_instance:
-  image: ghcr.io/cirruslabs/macos-monterey-xcode:13.4
-task:
-  name: AppleM1/LLVM armv8-ios xbuild
-  compile_script:
-  - #brew install llvm
-  - export #PATH=/opt/homebrew/opt/llvm/bin:$PATH
-  - export #LDFLAGS="-L/opt/homebrew/opt/llvm/lib"
-  - export #CPPFLAGS="-I/opt/homebrew/opt/llvm/include" 
-  - find /Applications/Xcode-13.4.1.app/Contents/Developer/Platforms -name "IPhoneOS*sdk"
-  - export CC=/Applications/Xcode-13.4.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
-  - export CFLAGS="-O2 -unwindlib=none -Wno-macro-redefined -isysroot /Applications/Xcode-13.4.1.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS15.5.sdk -arch arm64 -miphoneos-version-min=10.0"
-  - make TARGET=ARMV8 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1 CROSS=1
-  always:
-    config_artifacts:
-      path: "*conf*"
-      type: text/plain
-
-task:
-  name: NeoverseN1
-  arm_container:
-    image: node:latest
-  compile_script:
-  - make
-
-  task:
-  name: NeoverseN1-ILP64
-  arm_container:
-    image: node:latest
-  compile_script:
-  - make INTERFACE64=1
-
-task:
-  name: NeoverseN1-OMP
-  arm_container:
-    image: node:latest
-    cpu: 8
-  compile_script:
-  - make USE_OPENMP=1
-
-FreeBSD_task:
-  name: FreeBSD-gcc12
-  freebsd_instance:
-    image_family: freebsd-13-2
-  install_script:
-  - pkg update -f && pkg upgrade -y && pkg install -y gmake gcc
-  compile_script:
-  - ls -l /usr/local/lib
-  - gmake CC=gcc 
-
-
-FreeBSD_task:
-  name: freebsd-gcc12-ilp64
-  freebsd_instance:
-    image_family: freebsd-13-2
-  install_script:
-  - pkg update -f && pkg upgrade -y && pkg install -y gmake gcc
-  compile_script:
-  - ls -l /usr/local/lib
-  - gmake CC=gcc INTERFACE64=1
-
-#task:
-#  name: Windows/LLVM16     --- too slow ---
-#  windows_container:
-#    image: cirrusci/windowsservercore:cmake-2021.12.07
-#  install_script: 
-#    - choco list --localonly
-#    - choco install -y llvm
-#    - # choco install -y cmake --installargs '"ADD_CMAKE_TO_PATH=System"'
-#    - choco install -y ninja
-#    - refreshenv
-#    - cd "c:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Auxiliary/Build"
-#    - vcvarsall x64
-#    - cd "C:\Users\ContainerAdministrator\AppData\Local\Temp\cirrus-ci-build"
-#    - cmake -S . -B build -G "Ninja" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_MT=mt -DCMAKE_BUILD_TYPE=Release
-#    - cd build
-#    - cmake --build .
-#    - ctest
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,216 +0,0 @@
---
-kind: pipeline
-name: arm64_gcc_make
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: Build and Test
-  image: ubuntu:18.04
-  environment:
-    CC: gcc
-    COMMON_FLAGS: 'DYNAMIC_ARCH=1 TARGET=ARMV8 NUM_THREADS=32'
-  commands:
-    - echo "MAKE_FLAGS:= $COMMON_FLAGS"
-    - apt-get update -y
-    - apt-get install -y make $CC gfortran perl
-    - $CC --version
-    - make QUIET_MAKE=1 $COMMON_FLAGS
-    - make -C test $COMMON_FLAGS
-    - make -C ctest $COMMON_FLAGS
-    - make -C utest $COMMON_FLAGS
-
---
-kind: pipeline
-name: arm32_gcc_make
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
- name: Build and Test
-  image: ubuntu:18.04
-  environment:
-    CC: gcc
-    COMMON_FLAGS: 'DYNAMIC_ARCH=1 TARGET=ARMV6 NUM_THREADS=32'
-  commands:
-    - echo "MAKE_FLAGS:= $COMMON_FLAGS"
-    - apt-get update -y
-    - apt-get install -y make $CC gfortran perl
-    - $CC --version
-    - make QUIET_MAKE=1 $COMMON_FLAGS
-    - make -C test $COMMON_FLAGS
-    - make -C ctest $COMMON_FLAGS
-    - make -C utest $COMMON_FLAGS
-
---
-kind: pipeline
-name: arm64_clang_make
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: Build and Test
-  image: ubuntu:18.04
-  environment:
-    CC: clang
-    COMMON_FLAGS: 'DYNAMIC_ARCH=1 TARGET=ARMV8 NUM_THREADS=32'
-  commands:
-    - echo "MAKE_FLAGS:= $COMMON_FLAGS"
-    - apt-get update -y
-    - apt-get install -y make $CC gfortran perl
-    - $CC --version
-    - make QUIET_MAKE=1 $COMMON_FLAGS
-    - make -C test $COMMON_FLAGS
-    - make -C ctest $COMMON_FLAGS
-    - make -C utest $COMMON_FLAGS
-
---
-kind: pipeline
-name: arm32_clang_cmake
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
- name: Build and Test
-  image: ubuntu:18.04
-  environment:
-    CC: clang
-    CMAKE_FLAGS: '-DDYNAMIC_ARCH=1 -DTARGET=ARMV6 -DNUM_THREADS=32 -DNOFORTRAN=ON -DBUILD_WITHOUT_LAPACK=ON'
-  commands:
-    - echo "CMAKE_FLAGS:= $CMAKE_FLAGS"
-    - apt-get update -y
-    - apt-get install -y make $CC g++ perl cmake
-    - $CC --version
-    - mkdir build && cd build
-    - cmake $CMAKE_FLAGS ..
-    - make -j
-    - ctest -V
-
---
-kind: pipeline
-name: arm64_gcc_cmake
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: Build and Test
-  image: ubuntu:18.04
-  environment:
-    CC: gcc
-    CMAKE_FLAGS: '-DDYNAMIC_ARCH=1 -DTARGET=ARMV8 -DNUM_THREADS=32 -DNOFORTRAN=ON -DBUILD_WITHOUT_LAPACK=ON'
-  commands:
-    - echo "CMAKE_FLAGS:= $CMAKE_FLAGS"
-    - apt-get update -y
-    - apt-get install -y make $CC g++ perl cmake
-    - $CC --version
-    - mkdir build && cd build
-    - cmake $CMAKE_FLAGS ..
-    - make -j
-    - ctest -V
-
---
-kind: pipeline
-name: arm64_clang_cmake
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: Build and Test
-  image: ubuntu:18.04
-  environment:
-    CC: clang
-    CMAKE_FLAGS: '-DDYNAMIC_ARCH=1 -DTARGET=ARMV8 -DNUM_THREADS=32 -DNOFORTRAN=ON -DBUILD_WITHOUT_LAPACK=ON'
-  commands:
-    - echo "CMAKE_FLAGS:= $CMAKE_FLAGS"
-    - apt-get update -y
-    - apt-get install -y make $CC g++ perl cmake
-    - $CC --version
-    - mkdir build && cd build
-    - cmake $CMAKE_FLAGS ..
-    - make -j
-    - ctest -V
-
---
-kind: pipeline
-name: arm64_native_test
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: Build and Test
-  image: ubuntu:18.04
-  environment:
-    CC: gcc
-    COMMON_FLAGS: 'USE_OPENMP=1'
-  commands:
-    - echo "MAKE_FLAGS:= $COMMON_FLAGS"
-    - apt-get update -y
-    - apt-get install -y make $CC gfortran perl python g++
-    - $CC --version
-    - make QUIET_MAKE=1 $COMMON_FLAGS
-    - make -C test $COMMON_FLAGS
-    - make -C ctest $COMMON_FLAGS
-    - make -C utest $COMMON_FLAGS
-    - make -C cpp_thread_test dgemm_tester
---
-kind: pipeline
-name: epyc_native_test
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
- name: Build and Test
-  image: ubuntu:18.04
-  environment:
-    CC: gcc
-    COMMON_FLAGS: 'USE_OPENMP=1'
-  commands:
-    - echo "MAKE_FLAGS:= $COMMON_FLAGS"
-    - apt-get update -y
-    - apt-get install -y make $CC gfortran perl python g++
-    - $CC --version
-    - make QUIET_MAKE=1 $COMMON_FLAGS
-    - make -C test $COMMON_FLAGS
-    - make -C ctest $COMMON_FLAGS
-    - make -C utest $COMMON_FLAGS
-    - make -C cpp_thread_test dgemm_tester
---
-kind: pipeline
-name: arm64_gcc10
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: Build and Test
-  image: ubuntu:20.04
-  environment:
-    CC: gcc-10
-    FC: gfortran-10
-    COMMON_FLAGS: 'TARGET=ARMV8 DYNAMIC_ARCH=1'
-  commands:
-    - echo "MAKE_FLAGS:= $COMMON_FLAGS"
-    - apt-get update -y
-    - apt-get install -y make $CC gfortran-10 perl python g++
-    - $CC --version
-    - make QUIET_MAKE=1 $COMMON_FLAGS
-    - make -C utest $COMMON_FLAGS
-    - make -C test $COMMON_FLAGS
-    
--- a/.github/workflows/c910v.yml
+++ b/.github/workflows/c910v.yml
@@ -1,121 +0,0 @@
-name: c910v qemu test
-
-on: [push, pull_request]
-
-permissions:
-  contents: read # to fetch code (actions/checkout)
-
-jobs:
-  TEST:
-    runs-on: ubuntu-latest
-    env:
-      xuetie_toolchain: https://occ-oss-prod.oss-cn-hangzhou.aliyuncs.com/resource//1663142514282
-      toolchain_file_name: Xuantie-900-gcc-linux-5.10.4-glibc-x86_64-V2.6.1-20220906.tar.gz
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - target: RISCV64_GENERIC
-            triple: riscv64-linux-gnu
-            apt_triple: riscv64-linux-gnu
-            opts: NO_SHARED=1 TARGET=RISCV64_GENERIC
-          - target: C910V
-            triple: riscv64-unknown-linux-gnu
-            apt_triple: riscv64-linux-gnu
-            opts: NO_SHARED=1 TARGET=C910V
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: install build deps
-        run: |
-          sudo apt-get update
-          sudo apt-get install autoconf automake autotools-dev ninja-build make ccache \
-          gcc-${{ matrix.apt_triple }} gfortran-${{ matrix.apt_triple }} libgomp1-riscv64-cross
-
-      - name: checkout qemu
-        uses: actions/checkout@v3
-        with:
-          repository: T-head-Semi/qemu
-          path: qemu
-          ref: 1e692ebb43d396c52352406323fc782c1ac99a42
-
-      - name: build qemu
-        run: |
-          # Force use c910v qemu-user
-          wget https://github.com/revyos/qemu/commit/5164bca5a4bcde4534dc1a9aa3a7f619719874cf.patch
-          cd qemu
-          patch -p1 < ../5164bca5a4bcde4534dc1a9aa3a7f619719874cf.patch
-          ./configure --prefix=$GITHUB_WORKSPACE/qemu-install --target-list=riscv64-linux-user --disable-system
-          make -j$(nproc)
-          make install
-
-      - name: Compilation cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.ccache
-          key: ccache-${{ runner.os }}-${{ matrix.target }}-${{ github.ref }}-${{ github.sha }}
-          restore-keys: |
-            ccache-${{ runner.os }}-${{ matrix.target }}-${{ github.ref }}
-            ccache-${{ runner.os }}-${{ matrix.target }}
-
-      - name: Configure ccache
-        run: |
-          test -d ~/.ccache || mkdir -p ~/.ccache
-          echo "max_size = 300M" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          ccache -s
-
-      - name: build OpenBLAS
-        run: |
-            wget ${xuetie_toolchain}/${toolchain_file_name}
-            tar -xvf ${toolchain_file_name} -C /opt
-            export PATH="/opt/Xuantie-900-gcc-linux-5.10.4-glibc-x86_64-V2.6.1/bin:$PATH"
-
-            make CC='ccache ${{ matrix.triple }}-gcc -static' FC='ccache ${{ matrix.triple }}-gfortran -static' ${{ matrix.opts }} HOSTCC='ccache gcc' -j$(nproc)
-
-      - name: test
-        run: |
-          export PATH=$GITHUB_WORKSPACE/qemu-install/bin/:$PATH
-          qemu-riscv64 ./utest/openblas_utest
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./ctest/xscblat1
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./ctest/xdcblat1
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./ctest/xccblat1
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./ctest/xzcblat1
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./ctest/xscblat2 < ./ctest/sin2
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./ctest/xdcblat2 < ./ctest/din2
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./ctest/xccblat2 < ./ctest/cin2
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./ctest/xzcblat2 < ./ctest/zin2
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./ctest/xscblat3 < ./ctest/sin3
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./ctest/xdcblat3 < ./ctest/din3
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./ctest/xccblat3 < ./ctest/cin3
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./ctest/xzcblat3 < ./ctest/zin3
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-riscv64 ./test/sblat1
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-riscv64 ./test/dblat1
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-riscv64 ./test/cblat1
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-riscv64 ./test/zblat1
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./test/sblat1
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./test/dblat1
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./test/cblat1
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./test/zblat1
-          rm -f ./test/?BLAT2.SUMM
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-riscv64 ./test/sblat2 < ./test/sblat2.dat
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-riscv64 ./test/dblat2 < ./test/dblat2.dat
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-riscv64 ./test/cblat2 < ./test/cblat2.dat
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-riscv64 ./test/zblat2 < ./test/zblat2.dat
-          rm -f ./test/?BLAT2.SUMM
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./test/sblat2 < ./test/sblat2.dat
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./test/dblat2 < ./test/dblat2.dat
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./test/cblat2 < ./test/cblat2.dat
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./test/zblat2 < ./test/zblat2.dat
-          rm -f ./test/?BLAT3.SUMM
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-riscv64 ./test/sblat3 < ./test/sblat3.dat
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-riscv64 ./test/dblat3 < ./test/dblat3.dat
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-riscv64 ./test/cblat3 < ./test/cblat3.dat
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-riscv64 ./test/zblat3 < ./test/zblat3.dat
-          rm -f ./test/?BLAT3.SUMM
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./test/sblat3 < ./test/sblat3.dat
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./test/dblat3 < ./test/dblat3.dat
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./test/cblat3 < ./test/cblat3.dat
-          OPENBLAS_NUM_THREADS=2 qemu-riscv64 ./test/zblat3 < ./test/zblat3.dat
--- a/.github/workflows/dynamic_arch.yml
+++ b/.github/workflows/dynamic_arch.yml
@@ -1,336 +0,0 @@
-name: continuous build
-
-on: [push, pull_request]
-
-permissions:
-  contents: read # to fetch code (actions/checkout)
-
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-        fortran: [gfortran, flang]
-        build: [cmake, make]
-        exclude:
-          - os: macos-latest
-            fortran: flang
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Print system information
-        run: |
-          if [ "$RUNNER_OS" == "Linux" ]; then
-            cat /proc/cpuinfo
-          elif [ "$RUNNER_OS" == "macOS" ]; then
-            sysctl -a | grep machdep.cpu
-          else
-            echo "::error::$RUNNER_OS not supported"
-            exit 1
-          fi
-
-      - name: Install Dependencies
-        run: |
-          if [ "$RUNNER_OS" == "Linux" ]; then
-            sudo apt-get install -y gfortran cmake ccache libtinfo5
-          elif [ "$RUNNER_OS" == "macOS" ]; then
-            # It looks like "gfortran" isn't working correctly unless "gcc" is re-installed.
-            brew reinstall gcc
-            brew install coreutils cmake ccache
-          else
-            echo "::error::$RUNNER_OS not supported"
-            exit 1
-          fi
-
-      - name: Compilation cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.ccache
-          # We include the commit sha in the cache key, as new cache entries are
-          # only created if there is no existing entry for the key yet.
-          # GNU make and cmake call the compilers differently. It looks like
-          # that causes the cache to mismatch. Keep the ccache for both build
-          # tools separate to avoid polluting each other.
-          key: ccache-${{ runner.os }}-${{ matrix.build }}-${{ matrix.fortran }}-${{ github.ref }}-${{ github.sha }}
-          # Restore a matching ccache cache entry. Prefer same branch and same Fortran compiler.
-          restore-keys: |
-            ccache-${{ runner.os }}-${{ matrix.build }}-${{ matrix.fortran }}-${{ github.ref }}
-            ccache-${{ runner.os }}-${{ matrix.build }}-${{ matrix.fortran }}
-            ccache-${{ runner.os }}-${{ matrix.build }}
-
-      - name: Configure ccache
-        run: |
-          if [ "${{ matrix.build }}" = "make" ]; then
-            # Add ccache to path
-            if [ "$RUNNER_OS" = "Linux" ]; then
-              echo "/usr/lib/ccache" >> $GITHUB_PATH
-            elif [ "$RUNNER_OS" = "macOS" ]; then
-              echo "$(brew --prefix)/opt/ccache/libexec" >> $GITHUB_PATH
-            else
-              echo "::error::$RUNNER_OS not supported"
-              exit 1
-            fi
-          fi
-          # Limit the maximum size and switch on compression to avoid exceeding the total disk or cache quota (5 GB).
-          test -d ~/.ccache || mkdir -p ~/.ccache
-          echo "max_size = 300M" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          ccache -s
-
-      - name: Build OpenBLAS
-        run: |
-          if [ "${{ matrix.fortran }}" = "flang" ]; then
-            # download and install classic flang
-            cd /usr/
-            sudo wget -nv https://github.com/flang-compiler/flang/releases/download/flang_20190329/flang-20190329-x86-70.tgz
-            sudo tar xf flang-20190329-x86-70.tgz
-            sudo rm flang-20190329-x86-70.tgz
-            cd -
-          fi
-          case "${{ matrix.build }}" in
-            "make")
-              make -j$(nproc) DYNAMIC_ARCH=1 USE_OPENMP=0 FC="ccache ${{ matrix.fortran }}"
-              ;;
-            "cmake")
-              mkdir build && cd build
-              cmake -DDYNAMIC_ARCH=1 \
-                    -DNOFORTRAN=0 \
-                    -DBUILD_WITHOUT_LAPACK=0 \
-                    -DCMAKE_VERBOSE_MAKEFILE=ON \
-                    -DCMAKE_BUILD_TYPE=Release \
-                    -DCMAKE_Fortran_COMPILER=${{ matrix.fortran }} \
-                    -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-                    -DCMAKE_Fortran_COMPILER_LAUNCHER=ccache \
-                    ..
-              cmake --build .
-              ;;
-            *)
-              echo "::error::Configuration not supported"
-              exit 1
-              ;;
-          esac
-
-      - name: Show ccache status
-        continue-on-error: true
-        run: ccache -s
-
-      - name: Run tests
-        timeout-minutes: 60
-        run: |
-          case "${{ matrix.build }}" in
-            "make")
-              MAKE_FLAGS='DYNAMIC_ARCH=1 USE_OPENMP=0'
-              echo "::group::Tests in 'test' directory"
-              make -C test $MAKE_FLAGS FC="ccache ${{ matrix.fortran }}"
-              echo "::endgroup::"
-              echo "::group::Tests in 'ctest' directory"
-              make -C ctest $MAKE_FLAGS FC="ccache ${{ matrix.fortran }}"
-              echo "::endgroup::"
-              echo "::group::Tests in 'utest' directory"
-              make -C utest $MAKE_FLAGS FC="ccache ${{ matrix.fortran }}"
-              echo "::endgroup::"
-              ;;
-            "cmake")
-              cd build && ctest
-              ;;
-            *)
-              echo "::error::Configuration not supported"
-              exit 1
-              ;;
-          esac
-
-
-  msys2:
-    runs-on: windows-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        msystem: [MINGW64, MINGW32, CLANG64]
-        idx: [int32, int64]
-        build-type: [Release]
-        include:
-          - msystem: MINGW64
-            idx: int32
-            target-prefix: mingw-w64-x86_64
-            fc-pkg: mingw-w64-x86_64-gcc-fortran
-          - msystem: MINGW32
-            idx: int32
-            target-prefix: mingw-w64-i686
-            fc-pkg: mingw-w64-i686-gcc-fortran
-          - msystem: CLANG64
-            idx: int32
-            target-prefix: mingw-w64-clang-x86_64
-            c-lapack-flags: -DC_LAPACK=ON
-          - msystem: MINGW64
-            idx: int64
-            idx64-flags: -DBINARY=64 -DINTERFACE64=1
-            target-prefix: mingw-w64-x86_64
-            fc-pkg: mingw-w64-x86_64-gcc-fortran
-          - msystem: CLANG64
-            idx: int64
-            idx64-flags: -DBINARY=64 -DINTERFACE64=1
-            target-prefix: mingw-w64-clang-x86_64
-            c-lapack-flags: -DC_LAPACK=ON
-          - msystem: MINGW64
-            idx: int32
-            target-prefix: mingw-w64-x86_64
-            fc-pkg: mingw-w64-x86_64-gcc-fortran
-            build-type: None
-        exclude:
-          - msystem: MINGW32
-            idx: int64
-
-    defaults:
-      run:
-        # Use MSYS2 bash as default shell
-        shell: msys2 {0}
-
-    env:
-      CHERE_INVOKING: 1
-
-    steps:
-      - name: Get CPU name
-        shell: pwsh
-        run : |
-          Get-CIMInstance -Class Win32_Processor | Select-Object -Property Name
-
-      - name: Install build dependencies
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: ${{ matrix.msystem }}
-          update: true
-          release: false  # Use pre-installed version
-          install: >-
-            base-devel
-            ${{ matrix.target-prefix }}-cc
-            ${{ matrix.fc-pkg }}
-            ${{ matrix.target-prefix }}-cmake
-            ${{ matrix.target-prefix }}-ninja
-            ${{ matrix.target-prefix }}-ccache
-
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Prepare ccache
-        # Get cache location of ccache
-        # Create key that is used in action/cache/restore and action/cache/save steps
-        id: ccache-prepare
-        run: |
-          echo "ccachedir=$(cygpath -m $(ccache -k cache_dir))" >> $GITHUB_OUTPUT
-          # We include the commit sha in the cache key, as new cache entries are
-          # only created if there is no existing entry for the key yet.
-          echo "key=ccache-msys2-${{ matrix.msystem }}-${{ matrix.idx }}-${{ matrix.build-type }}-${{ github.ref }}-${{ github.sha }}" >> $GITHUB_OUTPUT
-
-      - name: Restore ccache
-        uses: actions/cache/restore@v3
-        with:
-          path: ${{ steps.ccache-prepare.outputs.ccachedir }}
-          key: ${{ steps.ccache-prepare.outputs.key }}
-          # Restore a matching ccache cache entry. Prefer same branch.
-          restore-keys: |
-            ccache-msys2-${{ matrix.msystem }}-${{ matrix.idx }}-${{ matrix.build-type }}-${{ github.ref }}
-            ccache-msys2-${{ matrix.msystem }}-${{ matrix.idx }}-${{ matrix.build-type }}
-
-      - name: Configure ccache
-        # Limit the maximum size and switch on compression to avoid exceeding the total disk or cache quota.
-        run: |
-          which ccache
-          test -d ${{ steps.ccache-prepare.outputs.ccachedir }} || mkdir -p ${{ steps.ccache-prepare.outputs.ccachedir }}
-          echo "max_size = 250M" > ${{ steps.ccache-prepare.outputs.ccachedir }}/ccache.conf
-          echo "compression = true" >> ${{ steps.ccache-prepare.outputs.ccachedir }}/ccache.conf
-          ccache -p
-          ccache -s
-          echo $HOME
-          cygpath -w $HOME
-
-      - name: Configure OpenBLAS
-        run: |
-          mkdir build && cd build
-          cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} \
-                -DBUILD_SHARED_LIBS=ON \
-                -DBUILD_STATIC_LIBS=ON \
-                -DDYNAMIC_ARCH=ON \
-                -DUSE_THREAD=ON \
-                -DNUM_THREADS=64 \
-                -DTARGET=CORE2 \
-                ${{ matrix.idx64-flags }} \
-                ${{ matrix.c-lapack-flags }} \
-                -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-                -DCMAKE_Fortran_COMPILER_LAUNCHER=ccache \
-                ..
-
-      - name: Build OpenBLAS
-        run: cd build && cmake --build .
-
-      - name: Show ccache status
-        continue-on-error: true
-        run: ccache -s
-
-      - name: Save ccache
-        # Save the cache after we are done (successfully) building
-        uses: actions/cache/save@v3
-        with:
-          path: ${{ steps.ccache-prepare.outputs.ccachedir }}
-          key: ${{ steps.ccache-prepare.outputs.key }}
-
-      - name: Run tests
-        timeout-minutes: 60
-        run: cd build && ctest
-
-
-  cross_build:
-    runs-on: ubuntu-22.04
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - target: mips64el
-            triple: mips64el-linux-gnuabi64
-            opts: DYNAMIC_ARCH=1 TARGET=GENERIC
-          - target: riscv64
-            triple: riscv64-linux-gnu
-            opts: TARGET=RISCV64_GENERIC
-          - target: mipsel
-            triple: mipsel-linux-gnu
-            opts: TARGET=MIPS1004K
-          - target: alpha
-            triple: alpha-linux-gnu
-            opts: TARGET=EV4
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Install Dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y ccache gcc-${{ matrix.triple }} gfortran-${{ matrix.triple }} libgomp1-${{ matrix.target }}-cross
-
-      - name: Compilation cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.ccache
-          key: ccache-${{ runner.os }}-${{ matrix.target }}-${{ github.ref }}-${{ github.sha }}
-          restore-keys: |
-            ccache-${{ runner.os }}-${{ matrix.target }}-${{ github.ref }}
-            ccache-${{ runner.os }}-${{ matrix.target }}
-
-      - name: Configure ccache
-        run: |
-          # Limit the maximum size and switch on compression to avoid exceeding the total disk or cache quota (5 GB).
-          test -d ~/.ccache || mkdir -p ~/.ccache
-          echo "max_size = 300M" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          ccache -s
-
-
-      - name: Build OpenBLAS
-        run: |
-          make -j$(nproc) HOSTCC="ccache gcc" CC="ccache ${{ matrix.triple }}-gcc" FC="ccache ${{ matrix.triple }}-gfortran" ARCH=${{ matrix.target }} ${{ matrix.opts }}
--- a/.github/workflows/mips64.yml
+++ b/.github/workflows/mips64.yml
@@ -1,117 +0,0 @@
-name: mips64 qemu test
-
-on: [push, pull_request]
-
-permissions:
-  contents: read # to fetch code (actions/checkout)
-
-jobs:
-  TEST:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - target: MIPS64_GENERIC
-            triple: mips64el-linux-gnuabi64
-            opts: NO_SHARED=1 TARGET=MIPS64_GENERIC
-          - target: SICORTEX
-            triple: mips64el-linux-gnuabi64
-            opts: NO_SHARED=1 TARGET=SICORTEX
-          - target: I6400
-            triple: mipsisa64r6el-linux-gnuabi64
-            opts: NO_SHARED=1 TARGET=I6400
-          - target: P6600
-            triple: mipsisa64r6el-linux-gnuabi64
-            opts: NO_SHARED=1 TARGET=P6600
-          - target: I6500
-            triple: mipsisa64r6el-linux-gnuabi64
-            opts: NO_SHARED=1 TARGET=I6500
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: install build deps
-        run: |
-          sudo apt-get update
-          sudo apt-get install autoconf automake autotools-dev ninja-build make ccache \
-          gcc-${{ matrix.triple }} gfortran-${{ matrix.triple }} libgomp1-mips64el-cross
-
-      - name: checkout qemu
-        uses: actions/checkout@v3
-        with:
-          repository: qemu/qemu
-          path: qemu
-          ref: 79dfa177ae348bb5ab5f97c0915359b13d6186e2
-
-      - name: build qemu
-        run: |
-          cd qemu
-          ./configure --prefix=$GITHUB_WORKSPACE/qemu-install --target-list=mips64el-linux-user --disable-system
-          make -j$(nproc)
-          make install
-
-      - name: Compilation cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.ccache
-          key: ccache-${{ runner.os }}-${{ matrix.target }}-${{ github.ref }}-${{ github.sha }}
-          restore-keys: |
-            ccache-${{ runner.os }}-${{ matrix.target }}-${{ github.ref }}
-            ccache-${{ runner.os }}-${{ matrix.target }}
-
-      - name: Configure ccache
-        run: |
-          test -d ~/.ccache || mkdir -p ~/.ccache
-          echo "max_size = 300M" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          ccache -s
-
-      - name: build OpenBLAS
-        run: make CC='ccache ${{ matrix.triple }}-gcc -static' FC='ccache ${{ matrix.triple }}-gfortran -static' ${{ matrix.opts }} HOSTCC='ccache gcc' -j$(nproc)
-
-      - name: test
-        run: |
-          export PATH=$GITHUB_WORKSPACE/qemu-install/bin/:$PATH
-          qemu-mips64el ./utest/openblas_utest
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xscblat1
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xdcblat1
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xccblat1
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xzcblat1
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xscblat2 < ./ctest/sin2
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xdcblat2 < ./ctest/din2
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xccblat2 < ./ctest/cin2
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xzcblat2 < ./ctest/zin2
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xscblat3 < ./ctest/sin3
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xdcblat3 < ./ctest/din3
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xccblat3 < ./ctest/cin3
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xzcblat3 < ./ctest/zin3
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/sblat1
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/dblat1
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/cblat1
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/zblat1
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/sblat1
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/dblat1
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/cblat1
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/zblat1
-          rm -f ./test/?BLAT2.SUMM
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/sblat2 < ./test/sblat2.dat
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/dblat2 < ./test/dblat2.dat
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/cblat2 < ./test/cblat2.dat
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/zblat2 < ./test/zblat2.dat
-          rm -f ./test/?BLAT2.SUMM
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/sblat2 < ./test/sblat2.dat
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/dblat2 < ./test/dblat2.dat
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/cblat2 < ./test/cblat2.dat
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/zblat2 < ./test/zblat2.dat
-          rm -f ./test/?BLAT3.SUMM
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/sblat3 < ./test/sblat3.dat
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/dblat3 < ./test/dblat3.dat
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/cblat3 < ./test/cblat3.dat
-          OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/zblat3 < ./test/zblat3.dat
-          rm -f ./test/?BLAT3.SUMM
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/sblat3 < ./test/sblat3.dat
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/dblat3 < ./test/dblat3.dat
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/cblat3 < ./test/cblat3.dat
-          OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/zblat3 < ./test/zblat3.dat
--- a/.github/workflows/nightly-Homebrew-build.yml
+++ b/.github/workflows/nightly-Homebrew-build.yml
@@ -1,85 +0,0 @@
-# Only the "head" branch of the OpenBLAS package is tested
-
-on:
-  push:
-    paths:
-      - '**/nightly-Homebrew-build.yml'
-  pull_request:
-    branches:
-      - develop
-    paths:
-      - '**/nightly-Homebrew-build.yml'
-  schedule:
-    - cron: 45 7 * * *
-# This is 7:45 AM UTC daily, late at night in the USA
-
-# Since push and pull_request will still always be building and testing the `develop` branch,
-# it only makes sense to test if this file has been changed
-
-name: Nightly-Homebrew-Build
-
-permissions:
-  contents: read # to fetch code (actions/checkout)
-
-jobs:
-  build-OpenBLAS-with-Homebrew:
-    runs-on: macos-latest
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_11.4.1.app/Contents/Developer
-      HOMEBREW_DEVELOPER: "ON"
-      HOMEBREW_DISPLAY_INSTALL_TIMES: "ON"
-      HOMEBREW_NO_ANALYTICS: "ON"
-      HOMEBREW_NO_AUTO_UPDATE: "ON"
-      HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: "ON"
-      HOMEBREW_NO_INSTALL_CLEANUP: "ON"
-      HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: "ON"
-      HOMEBREW_NO_INSTALL_FROM_API: "ON"      
-
-    steps:
-      - name: Random delay for cron job
-        run: |
-          delay=$(( RANDOM % 600 ))
-          printf 'Delaying for %s seconds on event %s' ${delay} "${{ github.event_name }}"
-          sleep ${delay}
-        if: github.event_name == 'schedule'
-
-      - uses: actions/checkout@v2
-        # This isn't even needed, technically. Homebrew will get `develop` via git
-
-      - name: Update Homebrew
-        if: github.event_name != 'pull_request'
-        run: brew update || true
-          
-      - name: Install prerequisites
-        run: brew install --fetch-HEAD --HEAD --only-dependencies --keep-tmp openblas
-
-      - name: Install and bottle OpenBLAS
-        run: brew install --fetch-HEAD --HEAD --build-bottle --keep-tmp openblas
-        # the HEAD flags tell Homebrew to build the develop branch fetch via git
-
-      - name: Create bottle
-        run: |
-          brew bottle -v openblas
-          mkdir bottles
-          mv *.bottle.tar.gz bottles
-
-      - name: Upload bottle
-        uses: actions/upload-artifact@v1
-        with:
-          name: openblas--HEAD.catalina.bottle.tar.gz
-          path: bottles
-
-      - name: Show linkage
-        run: brew linkage -v openblas
-
-      - name: Test openblas
-        run: brew test --HEAD --verbose openblas
-
-      - name: Audit openblas formula
-        run: |
-          brew audit --strict openblas
-          brew cat openblas
-
-      - name: Post logs on failure
-        if: failure()
-        run: brew gist-logs --with-hostname -v openblas
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@
 *.def
 *.o
 *.out
-*.tmp
 lapack-3.1.1
 lapack-3.1.1.tgz
 lapack-3.4.1
@@ -14,7 +13,6 @@ lapack-3.4.2
 lapack-3.4.2.tgz
 lapack-netlib/make.inc
 lapack-netlib/lapacke/include/lapacke_mangling.h
-lapack-netlib/SRC/la_constants.mod
 lapack-netlib/TESTING/testing_results.txt
 lapack-netlib/INSTALL/test*
 lapack-netlib/TESTING/xeigtstc
@@ -71,7 +69,6 @@ test/SBLAT2.SUMM
 test/SBLAT3.SUMM
 test/ZBLAT2.SUMM
 test/ZBLAT3.SUMM
-test/SHBLAT3.SUMM
 test/cblat1
 test/cblat2
 test/cblat3
@@ -81,7 +78,6 @@ test/dblat3
 test/sblat1
 test/sblat2
 test/sblat3
-test/test_shgemm
 test/zblat1
 test/zblat2
 test/zblat3
@@ -90,7 +86,4 @@ build.*
 *.swp
 benchmark/*.goto
 benchmark/smallscaling
-.vscode
-CMakeCache.txt
-CMakeFiles/*
-.vscode
+
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,316 +1,5 @@
-# XXX: Precise is already deprecated, new default is Trusty.
-# https://blog.travis-ci.com/2017-07-11-trusty-as-default-linux-is-coming
-dist: focal
-sudo: true
 language: c

-matrix:
-  include:
-    - &test-ubuntu
-#      os: linux
-      compiler: gcc
-      addons:
-        apt:
-          packages:
-            - gfortran
-#      before_script: &common-before
-#        - COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=NEHALEM NUM_THREADS=32"
-#      script:
-#        - make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
-#        - make -C test $COMMON_FLAGS $BTYPE
-#        - make -C ctest $COMMON_FLAGS $BTYPE
-#        - make -C utest $COMMON_FLAGS $BTYPE
-#      env:
-#        - TARGET_BOX=LINUX64
-#        - BTYPE="BINARY=64"
-#
-#    - <<: *test-ubuntu
-      os: linux
-      arch: ppc64le
-      before_script: &common-before
-        - COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=POWER8 NUM_THREADS=32"
-      script:
-        - travis_wait 50 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
-        - make -C test $COMMON_FLAGS $BTYPE
-        - make -C ctest $COMMON_FLAGS $BTYPE
-        - make -C utest $COMMON_FLAGS $BTYPE
-      env:
-        # for matrix annotation only
-        - TARGET_BOX=PPC64LE_LINUX
-        - BTYPE="BINARY=64 USE_OPENMP=1"
-
-    - <<: *test-ubuntu
-      os: linux
-      arch: s390x
-      before_script:
-        - COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=Z13 NUM_THREADS=32"
-        - sudo apt-get install --only-upgrade binutils
-      env:
-        # for matrix annotation only
-        - TARGET_BOX=IBMZ_LINUX
-        - BTYPE="BINARY=64 USE_OPENMP=1"
-
-    - <<: *test-ubuntu
-      os: linux
-      dist: focal
-      arch: s390x
-      compiler: clang
-      before_script:
-        - COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=Z13 NUM_THREADS=32"
-        - sudo apt-get install --only-upgrade binutils
-      env:
-        # for matrix annotation only
-        - TARGET_BOX=IBMZ_LINUX
-        - BTYPE="BINARY=64 USE_OPENMP=0 CC=clang"
-
-#    - <<: *test-ubuntu
-#      env:
-#        - TARGET_BOX=LINUX64
-#        - BTYPE="BINARY=64 USE_OPENMP=1"
-#
-#    - <<: *test-ubuntu
-#      env:
-#        - TARGET_BOX=LINUX64
-#        - BTYPE="BINARY=64 INTERFACE64=1"
-#
-#    - <<: *test-ubuntu
-#      compiler: clang
-#      env:
-#        - TARGET_BOX=LINUX64
-#        - BTYPE="BINARY=64 CC=clang"
-#
-#    - <<: *test-ubuntu
-#      compiler: clang
-#      env:
-#        - TARGET_BOX=LINUX64
-#        - BTYPE="BINARY=64 INTERFACE64=1 CC=clang"
-#
-#    - <<: *test-ubuntu
-#      addons:
-#        apt:
-#          packages:
-#            - gcc-multilib
-#            - gfortran-multilib
-#      env:
-#        - TARGET_BOX=LINUX32
-#        - BTYPE="BINARY=32"
-#
-    - os: linux
-      arch: ppc64le
-      dist: bionic
-      compiler: gcc
-      before_script:
-        - sudo add-apt-repository 'ppa:ubuntu-toolchain-r/test' -y
-        - sudo apt-get update
-        - sudo apt-get install gcc-9 gfortran-9 -y
-      script:
-        - travis_wait 50 make QUIET_MAKE=1  BINARY=64 USE_OPENMP=1 CC=gcc-9 FC=gfortran-9
-        - make -C test $COMMON_FLAGS $BTYPE
-        - make -C ctest $COMMON_FLAGS $BTYPE
-        - make -C utest $COMMON_FLAGS $BTYPE 
-      env:
-        # for matrix annotation only
-        - TARGET_BOX=PPC64LE_LINUX_P9
-
-    - os: linux
-      arch: ppc64le
-      dist: bionic
-      compiler: gcc
-      before_script:
-        - sudo add-apt-repository 'ppa:ubuntu-toolchain-r/test' -y
-        - sudo apt-get update
-        - sudo apt-get install gcc-9 gfortran-9 -y
-      script:
-        - travis_wait 50 make QUIET_MAKE=1  BUILD_BFLOAT16=1 BINARY=64 USE_OPENMP=1 CC=gcc-9 FC=gfortran-9
-        - make -C test $COMMON_FLAGS $BTYPE
-        - make -C ctest $COMMON_FLAGS $BTYPE
-        - make -C utest $COMMON_FLAGS $BTYPE 
-      env:
-        # for matrix annotation only
-        - TARGET_BOX=PPC64LE_LINUX_P9
-
-#    - os: linux
-#      compiler: gcc
-#      addons:
-#        apt:
-#          packages:
-#            - binutils-mingw-w64-x86-64
-#            - gcc-mingw-w64-x86-64
-#            - gfortran-mingw-w64-x86-64
-#      before_script: *common-before
-#      script:
-#        - travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
-#      env:
-#        - TARGET_BOX=WIN64
-#        - BTYPE="BINARY=64 HOSTCC=gcc CC=x86_64-w64-mingw32-gcc FC=x86_64-w64-mingw32-gfortran"
-#
-    # Build & test on Alpine Linux inside chroot, i.e. on system with musl libc.
-    # These jobs needs sudo, so Travis runs them on VM-based infrastructure
-    # which is slower than container-based infrastructure used for jobs
-    # that don't require sudo.
- #   - &test-alpine
- #     os: linux
- #     dist: trusty
- #     sudo: true
- #     language: minimal
- #     before_install:
- #       - "wget 'https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/v0.9.0/alpine-chroot-install' \
- #         && echo 'e5dfbbdc0c4b3363b99334510976c86bfa6cb251  alpine-chroot-install' | sha1sum -c || exit 1"
- #       - alpine() { /alpine/enter-chroot -u "$USER" "$@"; }
- #     install:
- #       - sudo sh alpine-chroot-install -p 'build-base gfortran perl linux-headers'
- #     before_script: *common-before
- #     script:
- #       # XXX: Disable some warnings for now to avoid exceeding Travis limit for log size.
- #       - alpine make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
- #             CFLAGS="-Wno-misleading-indentation -Wno-sign-conversion -Wno-incompatible-pointer-types"
- #       - alpine make -C test $COMMON_FLAGS $BTYPE
- #       - alpine make -C ctest $COMMON_FLAGS $BTYPE
- #       - alpine make -C utest $COMMON_FLAGS $BTYPE
- #     env:
- #       - TARGET_BOX=LINUX64_MUSL
- #       - BTYPE="BINARY=64"
-
-    # XXX: This job segfaults in TESTS OF THE COMPLEX LEVEL 3 BLAS,
-    # but only on Travis CI, cannot reproduce it elsewhere.
-    #- &test-alpine-openmp
-    #  <<: *test-alpine
-    #  env:
-    #    - TARGET_BOX=LINUX64_MUSL
-    #    - BTYPE="BINARY=64 USE_OPENMP=1"
-
-#    - <<: *test-alpine
-#      env:
-#        - TARGET_BOX=LINUX64_MUSL
-#        - BTYPE="BINARY=64 INTERFACE64=1"
-#
-#    # Build with the same flags as Alpine do in OpenBLAS package.
-#    - <<: *test-alpine
-#      env:
-#        - TARGET_BOX=LINUX64_MUSL
-#        - BTYPE="BINARY=64 NO_AFFINITY=1 USE_OPENMP=0 NO_LAPACK=0 TARGET=CORE2"
-
-#    - &test-cmake
-#      os: linux
-#      compiler: clang
-#      addons:
-#        apt:
-#          packages:
-#            - gfortran
-#            - cmake
-#      dist: trusty
-#      sudo: true
-#      before_script:
-#        - COMMON_ARGS="-DTARGET=NEHALEM -DNUM_THREADS=32"
-#      script:
-#        - mkdir build
-#        - CONFIG=Release
-#        - cmake -Bbuild -H. $CMAKE_ARGS $COMMON_ARGS -DCMAKE_BUILD_TYPE=$CONFIG
-#        - cmake --build build --config $CONFIG -- -j2
-#      env:
-#        - CMAKE=1
-#    - <<: *test-cmake
-#      env:
-#        - CMAKE=1 CMAKE_ARGS="-DNOFORTRAN=1"
-#    - <<: *test-cmake
-#      compiler: gcc
-#      env:
-#        - CMAKE=1
-
-#    - &test-macos
-#      os: osx
-#      osx_image: xcode11.5
-#      before_script:
-#        - COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
-#      script:
-#        - travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
-#      env:
-#        - BTYPE="TARGET=NEHALEM BINARY=64 INTERFACE64=1 FC=gfortran-9"
-#
-#    - <<: *test-macos
-#      osx_image: xcode12
-#      before_script:
-#        - COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
-#        - brew update
-#      script:
-#        - travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
-#      env:
-#        - BTYPE="TARGET=HASWELL USE_OPENMP=1 BINARY=64 INTERFACE64=1 CC=gcc-10 FC=gfortran-10"
-#
-#    - <<: *test-macos
-#      osx_image: xcode12
-#      before_script:
-#        - COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
-#        - brew update
-#      script:
-#        - travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
-#      env:
-#        - BTYPE="TARGET=NEHALEM BINARY=64 INTERFACE64=1 FC=gfortran-10"      
-
-  #  - <<: *test-macos
-  #    osx_image: xcode10
-  #    env:
-  #      - BTYPE="TARGET=NEHALEM BINARY=32 NOFORTRAN=1"
-
-#    - <<: *test-macos
-#      osx_image: xcode11.5
-#      before_script:
-#        - COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
-#        - brew update
-#      env:
-#        - CC="/Applications/Xcode-10.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
-#        - CFLAGS="-O2 -Wno-macro-redefined -isysroot /Applications/Xcode-10.1.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.1.sdk -arch arm64 -miphoneos-version-min=10.0"
-#        - CC="/Applications/Xcode-11.5.GM.Seed.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
-#        - CFLAGS="-O2 -Wno-macro-redefined -isysroot /Applications/Xcode-11.5.GM.Seed.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.5.sdk -arch arm64 -miphoneos-version-min=10.0"
-#        - BTYPE="TARGET=ARMV8 BINARY=64 HOSTCC=clang NOFORTRAN=1"
-#    - <<: *test-macos
-#      osx_image: xcode11.5
-#      env:
-##        - CC="/Applications/Xcode-10.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
-##        - CFLAGS="-O2 -mno-thumb -Wno-macro-redefined -isysroot /Applications/Xcode-10.1.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.1.sdk -arch armv7 -miphoneos-version-min=5.1"
-#        - CC="/Applications/Xcode-11.5.GM.Seed.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
-#        - CFLAGS="-O2 -mno-thumb -Wno-macro-redefined -isysroot /Applications/Xcode-11.5.GM.Seed.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.5.sdk -arch armv7 -miphoneos-version-min=5.1"
-#        - BTYPE="TARGET=ARMV7 HOSTCC=clang NOFORTRAN=1"
-
-    - &test-neoversen1
-      os: linux
-      arch: arm64
-      dist: focal
-      group: edge
-      virt: lxd
-      compiler: gcc
-      addons:
-        apt:
-          packages:
-            - gfortran
-      script:
-        - travis_wait 45 make && make lapack-test
-      env:
-        - TARGET_BOX=NEOVERSE_N1 
-  
-    - &test-neon1-gcc8
-      os: linux
-      arch: arm64
-      dist: focal
-      group: edge
-      virt: lxd
-      compiler: gcc
-      addons:
-        apt:
-          packages:
-            - gcc-8
-            - gfortran-8
-      script:
-        - travis_wait 45 make QUIET_MAKE=1 CC=gcc-8 FC=gfortran-8 DYNAMIC_ARCH=1 
-      env:
-        - TARGET_BOX=NEOVERSE_N1-GCC8
-        
-# whitelist
-branches:
-  only:
-    - master
-    - develop
-
 notifications:
  webhooks:
    urls:
@@ -318,3 +7,32 @@ notifications:
    on_success: change  # options: [always|never|change] default: always
    on_failure: always  # options: [always|never|change] default: always
    on_start: never     # options: [always|never|change] default: always
+
+compiler:
+  - gcc
+
+env:
+  - TARGET_BOX=LINUX64 BTYPE="BINARY=64"
+  - TARGET_BOX=LINUX64 BTYPE="BINARY=64 USE_OPENMP=1"
+  - TARGET_BOX=LINUX64 BTYPE="BINARY=64 INTERFACE64=1"
+  - TARGET_BOX=LINUX32 BTYPE="BINARY=32"
+  - TARGET_BOX=WIN64 BTYPE="BINARY=64 HOSTCC=gcc CC=x86_64-w64-mingw32-gcc FC=x86_64-w64-mingw32-gfortran"
+
+before_install:
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq gfortran
+ - if [[ "$TARGET_BOX" == "WIN64" ]]; then sudo apt-get install -qq binutils-mingw-w64-x86-64 gcc-mingw-w64-x86-64 gfortran-mingw-w64-x86-64; fi
+ - if [[ "$TARGET_BOX" == "LINUX32" ]]; then sudo apt-get install -qq  gcc-multilib gfortran-multilib; fi
+
+script: 
+ - set -e
+ - make QUIET_MAKE=1 DYNAMIC_ARCH=1 TARGET=NEHALEM NUM_THREADS=32 $BTYPE
+ - if [ "$TARGET_BOX" == "LINUX32" ] || [ "$TARGET_BOX" == "LINUX64" ]; then make -C test DYNAMIC_ARCH=1 TARGET=NEHALEM NUM_THREADS=32 $BTYPE; fi
+ - if [ "$TARGET_BOX" == "LINUX32" ] || [ "$TARGET_BOX" == "LINUX64" ]; then make -C ctest DYNAMIC_ARCH=1 TARGET=NEHALEM NUM_THREADS=32 $BTYPE; fi
+ - if [ "$TARGET_BOX" == "LINUX32" ] || [ "$TARGET_BOX" == "LINUX64" ]; then make -C utest DYNAMIC_ARCH=1 TARGET=NEHALEM NUM_THREADS=32 $BTYPE; fi
+
+# whitelist
+branches:
+  only:
+    - master
+    - develop
--- a/BACKERS.md
+++ b/BACKERS.md
@@ -1,9 +1,5 @@
 Thank you for the support.

-### [2019.12/2021.9] [Chan-Zuckerberg Foundation EOSS Initiative](https://chanzuckerberg.com/eoss/)
-
-Between December 2019 and September 2021, development and maintaining of OpenBLAS was funded in part by the Chan-Zuckerberg Foundation in the context of  two grants awarded to the NumPy Foundation and managed by NumFocus (Cycles 1 and 3 of the Essential Open Source Software for Science (EOSS) Initiative of the Chan-Zuckerberg Foundation)  
-
 ### [2013.8] [Testbed for OpenBLAS project](https://www.bountysource.com/fundraisers/443-testbed-for-openblas-project)

 https://www.bountysource.com/fundraisers/443-testbed-for-openblas-project/pledges
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,101 +3,64 @@
 ##

 cmake_minimum_required(VERSION 2.8.5)
-
-project(OpenBLAS C ASM)
-
+project(OpenBLAS)
 set(OpenBLAS_MAJOR_VERSION 0)
-set(OpenBLAS_MINOR_VERSION 3)
-set(OpenBLAS_PATCH_VERSION 23.dev)
-
+set(OpenBLAS_MINOR_VERSION 2)
+set(OpenBLAS_PATCH_VERSION 20)
 set(OpenBLAS_VERSION "${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.${OpenBLAS_PATCH_VERSION}")

+enable_language(ASM)
+enable_language(C)
+
 # Adhere to GNU filesystem layout conventions
 include(GNUInstallDirs)

-include(CMakePackageConfigHelpers)
+if(MSVC)
+set(OpenBLAS_LIBNAME libopenblas)
+else()
+set(OpenBLAS_LIBNAME openblas)
+endif()

 #######
-option(BUILD_WITHOUT_LAPACK "Do not build LAPACK and LAPACKE (Only BLAS or CBLAS)" OFF)
-
-option(BUILD_LAPACK_DEPRECATED "When building LAPACK, include also some older, deprecated routines" ON)
-
-option(BUILD_TESTING "Build LAPACK testsuite when building LAPACK" ON)
-
-option(C_LAPACK "Build LAPACK from C sources instead of the original Fortran" OFF)
-
-option(BUILD_WITHOUT_CBLAS "Do not build the C interface (CBLAS) to the BLAS functions" OFF)
-
-option(DYNAMIC_ARCH "Include support for multiple CPU targets, with automatic selection at runtime (x86/x86_64, aarch64 or ppc only)" OFF)
-
-option(DYNAMIC_OLDER "Include specific support for older x86 cpu models (Penryn,Dunnington,Atom,Nano,Opteron) with DYNAMIC_ARCH" OFF)
-
-option(BUILD_RELAPACK "Build with ReLAPACK (recursive implementation of several LAPACK functions on top of standard LAPACK)" OFF)
-
-option(USE_LOCKING "Use locks even in single-threaded builds to make them callable from multiple threads" OFF)
-
-option(USE_PERL "Use the older PERL scripts for build preparation instead of universal shell scripts" OFF)
-
-option(NO_WARMUP "Do not run a benchmark on each startup just to find the best location for the memory buffer" ON)
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  option(NO_AFFINITY "Disable support for CPU affinity masks to avoid binding processes from e.g. R or numpy/scipy to a single core" ON)
-else()
-  set(NO_AFFINITY 1)
+if(MSVC)
+option(BUILD_WITHOUT_LAPACK "Without LAPACK and LAPACKE (Only BLAS or CBLAS)" ON)
 endif()
-
-option(CPP_THREAD_SAFETY_TEST "Run a massively parallel DGEMM test to confirm thread safety of the library (requires OpenMP and about 1.3GB of RAM)" OFF)
-
-option(CPP_THREAD_SAFETY_GEMV "Run a massively parallel DGEMV test to confirm thread safety of the library (requires OpenMP)" OFF)
-option(BUILD_STATIC_LIBS "Build static library" OFF)
-if(NOT BUILD_STATIC_LIBS AND NOT BUILD_SHARED_LIBS)
-  set(BUILD_STATIC_LIBS ON CACHE BOOL "Build static library" FORCE)
-endif()
-if((BUILD_STATIC_LIBS AND BUILD_SHARED_LIBS) AND MSVC)
-  message(WARNING "Could not enable both BUILD_STATIC_LIBS and BUILD_SHARED_LIBS with MSVC, Disable BUILD_SHARED_LIBS")
-  set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build static library" FORCE)
-endif()
-
-# Add a prefix or suffix to all exported symbol names in the shared library.
-# Avoids conflicts with other BLAS libraries, especially when using
-# 64 bit integer interfaces in OpenBLAS.
-set(SYMBOLPREFIX "" CACHE STRING  "Add a prefix to all exported symbol names in the shared library to avoid conflicts with other BLAS libraries" )
-
-set(SYMBOLSUFFIX "" CACHE STRING  "Add a suffix to all exported symbol names in the shared library, e.g. _64 for INTERFACE64 builds" )
-
+option(BUILD_WITHOUT_CBLAS "Without CBLAS" OFF)
+option(BUILD_DEBUG "Build Debug Version" OFF)
 #######
 if(BUILD_WITHOUT_LAPACK)
-  set(NO_LAPACK 1)
-  set(NO_LAPACKE 1)
+set(NO_LAPACK 1)
+set(NO_LAPACKE 1)
+endif()
+
+if(CMAKE_CONFIGURATION_TYPES) # multiconfig generator?
+        set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
+        set(CMAKE_BUILD_TYPE
+	        Debug Debug
+		Release Release
+	)
+else()
+	if( NOT CMAKE_BUILD_TYPE )
+		if(BUILD_DEBUG)
+			set(CMAKE_BUILD_TYPE Debug)
+		else()
+			set(CMAKE_BUILD_TYPE Release)
+		endif()
+	endif()
 endif()

 if(BUILD_WITHOUT_CBLAS)
-  set(NO_CBLAS 1)
+set(NO_CBLAS 1)
 endif()

 #######

-if(MSVC AND MSVC_STATIC_CRT)
-  set(CompilerFlags
-        CMAKE_CXX_FLAGS
-        CMAKE_CXX_FLAGS_DEBUG
-        CMAKE_CXX_FLAGS_RELEASE
-        CMAKE_C_FLAGS
-        CMAKE_C_FLAGS_DEBUG
-        CMAKE_C_FLAGS_RELEASE
-        )
-  foreach(CompilerFlag ${CompilerFlags})
-    string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
-  endforeach()
-endif()

-message(WARNING "CMake support is experimental. It does not yet support all build options and may not produce the same Makefiles that OpenBLAS ships with.")
+message(WARNING "CMake support is experimental. This will not produce the same Makefiles that OpenBLAS ships with. Only x86 support is currently available.")

 include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
 include("${PROJECT_SOURCE_DIR}/cmake/system.cmake")

-set(OpenBLAS_LIBNAME openblas${SUFFIX64_UNDERSCORE})
-
 set(BLASDIRS interface driver/level2 driver/level3 driver/others)

 if (NOT DYNAMIC_ARCH)
@@ -110,29 +73,18 @@ endif ()

 set(SUBDIRS	${BLASDIRS})
 if (NOT NO_LAPACK)
-  if(BUILD_RELAPACK)
-    list(APPEND SUBDIRS relapack/src)
-  endif()
  list(APPEND SUBDIRS lapack)
 endif ()

-if (NOT DEFINED BUILD_BFLOAT16)
- set (BUILD_BFLOAT16 false)
-endif ()
 # set which float types we want to build for
 if (NOT DEFINED BUILD_SINGLE AND NOT DEFINED BUILD_DOUBLE AND NOT DEFINED BUILD_COMPLEX AND NOT DEFINED BUILD_COMPLEX16)
  # if none are defined, build for all
-  # set(BUILD_BFLOAT16 true)
  set(BUILD_SINGLE true)
  set(BUILD_DOUBLE true)
  set(BUILD_COMPLEX true)
  set(BUILD_COMPLEX16 true)
 endif ()

-if (NOT DEFINED BUILD_MATGEN)
-  set(BUILD_MATGEN true)
-endif()
-
 set(FLOAT_TYPES "")
 if (BUILD_SINGLE)
  message(STATUS "Building Single Precision")
@@ -154,23 +106,26 @@ if (BUILD_COMPLEX16)
  list(APPEND FLOAT_TYPES "ZCOMPLEX") # defines COMPLEX and DOUBLE
 endif ()

-if (BUILD_BFLOAT16)
-  message(STATUS "Building Half Precision")
-  #  list(APPEND FLOAT_TYPES "BFLOAT16") # defines nothing
-endif ()
+set(SUBDIRS_ALL ${SUBDIRS} test ctest utest exports benchmark ../laswp ../bench)

+# all :: libs netlib tests shared
+
+# libs :
 if (NOT DEFINED CORE OR "${CORE}" STREQUAL "UNKNOWN")
  message(FATAL_ERROR "Detecting CPU failed. Please set TARGET explicitly, e.g. make TARGET=your_cpu_target. Please read README for details.")
 endif ()

+if (${NO_STATIC} AND ${NO_SHARED})
+  message(FATAL_ERROR "Neither static nor shared are enabled.")
+endif ()
+
 #Set default output directory
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 if(MSVC)
-  set( CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${PROJECT_BINARY_DIR}/lib/Debug)
-  set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BINARY_DIR}/lib/Release)
+set( CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${PROJECT_BINARY_DIR}/lib/Debug)
+set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BINARY_DIR}/lib/Release)
 endif ()
-
 # get obj vars into format that add_library likes: $<TARGET_OBJS:objlib> (see http://www.cmake.org/cmake/help/v3.0/command/add_library.html)
 set(TARGET_OBJS "")
 foreach (SUBDIR ${SUBDIRS})
@@ -183,386 +138,156 @@ endforeach ()

 # Can't just use lapack-netlib's CMake files, since they are set up to search for BLAS, build and install a binary. We just want to build a couple of lib files out of lapack and lapacke.
 # Not using add_subdirectory here because lapack-netlib already has its own CMakeLists.txt. Instead include a cmake script with the sources we want.
-if (NOT NO_LAPACK)
+if (NOT NOFORTRAN AND NOT NO_LAPACK)
  include("${PROJECT_SOURCE_DIR}/cmake/lapack.cmake")
-  if (NOT NO_LAPACKE)
-    include("${PROJECT_SOURCE_DIR}/cmake/lapacke.cmake")
-  endif ()
+if (NOT NO_LAPACKE)
+  include("${PROJECT_SOURCE_DIR}/cmake/lapacke.cmake")
+endif ()
 endif ()

 # Only generate .def for dll on MSVC and always produce pdb files for debug and release
 if(MSVC)
-  if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_LESS 3.4)
-    set(OpenBLAS_DEF_FILE "${PROJECT_BINARY_DIR}/openblas.def")
-  endif()
-  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi")
-  set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
+set(OpenBLAS_DEF_FILE "${PROJECT_BINARY_DIR}/openblas.def")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi")
+set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
 endif()

-if (${DYNAMIC_ARCH})
-  add_subdirectory(kernel)
-  foreach(TARGET_CORE ${DYNAMIC_CORE})
-    message("${TARGET_CORE}")
-    list(APPEND TARGET_OBJS "$<TARGET_OBJECTS:kernel_${TARGET_CORE}>")
-  endforeach()
-endif ()
-
 # add objects to the openblas lib
-if(NOT NO_LAPACK)
-  add_library(LAPACK_OVERRIDES OBJECT ${LA_SOURCES})
-  list(APPEND TARGET_OBJS "$<TARGET_OBJECTS:LAPACK_OVERRIDES>")
-endif()
-if(NOT NO_LAPACKE)
-  add_library(LAPACKE OBJECT ${LAPACKE_SOURCES})
-  list(APPEND TARGET_OBJS "$<TARGET_OBJECTS:LAPACKE>")
-endif()
-#if(BUILD_RELAPACK)
-#  add_library(RELAPACK OBJECT ${RELA_SOURCES})
-#  list(APPEND TARGET_OBJS "$<TARGET_OBJECTS:RELAPACK>")
-#endif()
-set(OpenBLAS_LIBS "")
-if(BUILD_STATIC_LIBS)
-  add_library(${OpenBLAS_LIBNAME}_static STATIC ${TARGET_OBJS} ${OpenBLAS_DEF_FILE})
-  target_include_directories(${OpenBLAS_LIBNAME}_static INTERFACE $<INSTALL_INTERFACE:include/openblas${SUFFIX64}>)
-  list(APPEND OpenBLAS_LIBS ${OpenBLAS_LIBNAME}_static)
-endif()
-if(BUILD_SHARED_LIBS)
-  add_library(${OpenBLAS_LIBNAME}_shared SHARED ${TARGET_OBJS} ${OpenBLAS_DEF_FILE})
-  target_include_directories(${OpenBLAS_LIBNAME}_shared INTERFACE $<INSTALL_INTERFACE:include/openblas${SUFFIX64}>)
-  list(APPEND OpenBLAS_LIBS ${OpenBLAS_LIBNAME}_shared)
-endif()
-if(BUILD_STATIC_LIBS)
-  add_library(${OpenBLAS_LIBNAME} ALIAS ${OpenBLAS_LIBNAME}_static)
-else()
-  add_library(${OpenBLAS_LIBNAME} ALIAS ${OpenBLAS_LIBNAME}_shared)
-endif()
+add_library(${OpenBLAS_LIBNAME} SHARED ${LA_SOURCES} ${LAPACKE_SOURCES} ${TARGET_OBJS} ${OpenBLAS_DEF_FILE})

-set_target_properties(${OpenBLAS_LIBS} PROPERTIES OUTPUT_NAME ${OpenBLAS_LIBNAME})
-
-# Android needs to explicitly link against libm
-if (${CMAKE_SYSTEM_NAME} MATCHES "AIX|Android|Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|Darwin")
-  if(BUILD_STATIC_LIBS)
-    target_link_libraries(${OpenBLAS_LIBNAME}_static m)
-  endif()
-  if(BUILD_SHARED_LIBS)
-    target_link_libraries(${OpenBLAS_LIBNAME}_shared m)
-  endif()
-endif()
-
-if (APPLE AND DYNAMIC_ARCH AND BUILD_SHARED_LIBS)
-  set (CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-  if (NOT NOFORTRAN)
-  set (CMAKE_Fortran_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-  set (CMAKE_Fortran_CREATE_SHARED_LIBRARY
- "sh -c 'cat ${CMAKE_BINARY_DIR}/CMakeFiles/openblas_shared.dir/objects*.rsp | xargs -n 1024 ar -ru libopenblas.a && exit 0' "
- "sh -c 'ar -ru libopenblas.a ${CMAKE_BINARY_DIR}/driver/others/CMakeFiles/driver_others.dir/xerbla.c.o && exit 0' "
- "sh -c 'echo \"\" | ${CMAKE_Fortran_COMPILER} -o dummy.o -c -x f95-cpp-input - '"
- "sh -c '${CMAKE_Fortran_COMPILER} -fpic -shared -Wl,-all_load -Wl,-force_load,libopenblas.a -Wl,-noall_load dummy.o -o ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libopenblas.${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.dylib'"
- "sh -c 'ls -l ${CMAKE_BINARY_DIR}/lib'")
-  else ()
-  set (CMAKE_C_CREATE_SHARED_LIBRARY
-   "sh -c 'cat ${CMAKE_BINARY_DIR}/CMakeFiles/openblas_shared.dir/objects*.rsp | xargs -n 1024 ar -ru libopenblas.a && exit 0' "
-   "sh -c 'ar -ru libopenblas.a ${CMAKE_BINARY_DIR}/driver/others/CMakeFiles/driver_others.dir/xerbla.c.o && exit 0' "
-   "sh -c '${CMAKE_C_COMPILER} -fpic -shared -Wl,-all_load -Wl,-force_load,libopenblas.a -Wl,-noall_load -o ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libopenblas.${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.dylib'")
-  endif ()
-endif()
-
-# Handle MSVC exports
-if(MSVC AND BUILD_SHARED_LIBS)
-  if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_LESS 3.4)
-    include("${PROJECT_SOURCE_DIR}/cmake/export.cmake")
-  else()
-    # Creates verbose .def file (51KB vs 18KB)
-    set_target_properties(${OpenBLAS_LIBNAME}_shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS true)
-  endif()
-endif()
+include("${PROJECT_SOURCE_DIR}/cmake/export.cmake")

 # Set output for libopenblas
-set_target_properties( ${OpenBLAS_LIBS} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
-set_target_properties( ${OpenBLAS_LIBS} PROPERTIES LIBRARY_OUTPUT_NAME_DEBUG "${OpenBLAS_LIBNAME}_d")
-set_target_properties( ${OpenBLAS_LIBS} PROPERTIES EXPORT_NAME "OpenBLAS")
+set_target_properties( ${OpenBLAS_LIBNAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+set_target_properties( ${OpenBLAS_LIBNAME} PROPERTIES LIBRARY_OUTPUT_NAME_DEBUG "${OpenBLAS_LIBNAME}_d")

 foreach (OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
  string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
-
-  set_target_properties( ${OpenBLAS_LIBS} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_BINARY_DIR}/lib/${OUTPUTCONFIG} )
-  set_target_properties( ${OpenBLAS_LIBS} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_BINARY_DIR}/lib/${OUTPUTCONFIG} )
-  set_target_properties( ${OpenBLAS_LIBS} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_BINARY_DIR}/lib/${OUTPUTCONFIG} )
+  
+  set_target_properties( ${OpenBLAS_LIBNAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_BINARY_DIR}/lib/${OUTPUTCONFIG} )
+  set_target_properties( ${OpenBLAS_LIBNAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_BINARY_DIR}/lib/${OUTPUTCONFIG} )
+  set_target_properties( ${OpenBLAS_LIBNAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_BINARY_DIR}/lib/${OUTPUTCONFIG} )
 endforeach()

 enable_testing()
+add_subdirectory(utest)

-if (USE_THREAD)
-  # Add threading library to linker
-  find_package(Threads)
-  if (THREADS_HAVE_PTHREAD_ARG)
-    set_target_properties(${OpenBLAS_LIBS} PROPERTIES
-      COMPILE_OPTIONS "-pthread"
-      INTERFACE_COMPILE_OPTIONS "-pthread"
-    )
-  endif()
-  if(BUILD_STATIC_LIBS)
-    target_link_libraries(${OpenBLAS_LIBNAME}_static ${CMAKE_THREAD_LIBS_INIT})
-  endif()
-  if(BUILD_SHARED_LIBS)
-    target_link_libraries(${OpenBLAS_LIBNAME}_shared ${CMAKE_THREAD_LIBS_INIT})
-  endif()
+if (NOT MSVC)
+	#only build shared library for MSVC
+
+	add_library(${OpenBLAS_LIBNAME}_static STATIC ${LA_SOURCES} ${LAPACKE_SOURCES} ${TARGET_OBJS})
+	set_target_properties(${OpenBLAS_LIBNAME}_static PROPERTIES OUTPUT_NAME ${OpenBLAS_LIBNAME})
+	set_target_properties(${OpenBLAS_LIBNAME}_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+
+	if(SMP)
+	target_link_libraries(${OpenBLAS_LIBNAME} pthread)
+	target_link_libraries(${OpenBLAS_LIBNAME}_static pthread)
 endif()

-#if (MSVC OR NOT NOFORTRAN)
-if (NOT NO_CBLAS)
-  if (NOT ONLY_CBLAS)
-  # Broken without fortran on unix
-    add_subdirectory(utest)
+#build test and ctest
+add_subdirectory(test)
+if(NOT NO_CBLAS)
+add_subdirectory(ctest)
 endif()
 endif()

-if (NOT NOFORTRAN)
- if (NOT ONLY_CBLAS)
-  # Build test and ctest
-  add_subdirectory(test)
- endif() 
-  if (BUILD_TESTING)
-    add_subdirectory(lapack-netlib/TESTING)
-  endif()
-endif()
-  if(NOT NO_CBLAS)
-   if (NOT ONLY_CBLAS)
-    add_subdirectory(ctest)
-   endif()
-  endif()
-  if (CPP_THREAD_SAFETY_TEST OR CPP_THREAD_SAFETY_GEMV)
-    add_subdirectory(cpp_thread_test)
-  endif()
-
-set_target_properties(${OpenBLAS_LIBS} PROPERTIES
+set_target_properties(${OpenBLAS_LIBNAME} PROPERTIES 
  VERSION ${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}
  SOVERSION ${OpenBLAS_MAJOR_VERSION}
 )

-if (BUILD_SHARED_LIBS AND BUILD_RELAPACK)
-  if (NOT MSVC)
-    target_link_libraries(${OpenBLAS_LIBNAME}_shared "-Wl,-allow-multiple-definition")
-  else()
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /FORCE:MULTIPLE")
-  endif()
-endif()
-
-if (BUILD_SHARED_LIBS AND NOT ${SYMBOLPREFIX}${SYMBOLSUFFIX} STREQUAL "")
-  if (NOT DEFINED ARCH)
-    set(ARCH_IN "x86_64")
-  else()
-    set(ARCH_IN ${ARCH})
-  endif()
-
-  if (${CORE} STREQUAL "generic")
-    set(ARCH_IN "GENERIC")
-  endif ()
-
-  if (NOT DEFINED EXPRECISION)
-    set(EXPRECISION_IN 0)
-  else()
-    set(EXPRECISION_IN ${EXPRECISION})
-  endif()
-
-  if (NOT DEFINED NO_CBLAS)
-    set(NO_CBLAS_IN 0)
-  else()
-    set(NO_CBLAS_IN ${NO_CBLAS})
-  endif()
-
-  if (NOT DEFINED NO_LAPACK)
-    set(NO_LAPACK_IN 0)
-  else()
-    set(NO_LAPACK_IN ${NO_LAPACK})
-  endif()
-
-  if (NOT DEFINED NO_LAPACKE)
-    set(NO_LAPACKE_IN 0)
-  else()
-    set(NO_LAPACKE_IN ${NO_LAPACKE})
-  endif()
-
-  if (NOT DEFINED NEED2UNDERSCORES)
-    set(NEED2UNDERSCORES_IN 0)
-  else()
-    set(NEED2UNDERSCORES_IN ${NEED2UNDERSCORES})
-  endif()
-
-  if (NOT DEFINED ONLY_CBLAS)
-    set(ONLY_CBLAS_IN 0)
-  else()
-    set(ONLY_CBLAS_IN ${ONLY_CBLAS})
-  endif()
-
-  if (NOT DEFINED BU)
-    set(BU _)
-  endif()
-
-  if (NOT ${SYMBOLPREFIX} STREQUAL "")
-    message(STATUS "adding prefix ${SYMBOLPREFIX} to names of exported symbols in ${OpenBLAS_LIBNAME}")
-  endif()
-  if (NOT ${SYMBOLSUFFIX} STREQUAL "")
-    message(STATUS "adding suffix ${SYMBOLSUFFIX} to names of exported symbols in ${OpenBLAS_LIBNAME}")
-  endif()
-
-  if (${BUILD_LAPACK_DEPRECATED})
-	  set (BLD 1)
-  else ()
-	  set (BLD 0)
-  endif()
-  if (${BUILD_BFLOAT16})
-	  set (BBF16 1)
-  else ()
-	  set (BBF16 0)
-  endif()
-  if (${BUILD_SINGLE})
-	  set (BS 1)
-  else ()
-	  set (BS 0)
-  endif()
-  if (${BUILD_DOUBLE})
-	  set (BD 1)
-  else ()
-	  set (BD 0)
-  endif()
-  if (${BUILD_COMPLEX})
-	  set (BC 1)
-  else ()
-	  set (BC 0)
-  endif()
-  if (${BUILD_COMPLEX16})
-	  set (BZ 1)
-  else ()
-	  set (BZ 0)
-  endif()
-  if (NOT USE_PERL)
-  add_custom_command(TARGET ${OpenBLAS_LIBNAME}_shared POST_BUILD
-	  COMMAND  ${PROJECT_SOURCE_DIR}/exports/gensymbol "objcopy" "${ARCH}" "${BU}" "${EXPRECISION_IN}" "${NO_CBLAS_IN}" "${NO_LAPACK_IN}" "${NO_LAPACKE_IN}" "${NEED2UNDERSCORES_IN}" "${ONLY_CBLAS_IN}" \"${SYMBOLPREFIX}\" \"${SYMBOLSUFFIX}\" "${BLD}" "${BBF16}" "${BS}" "${BD}" "${BC}" "${BZ}" > ${PROJECT_BINARY_DIR}/objcopy.def 
-    COMMAND objcopy -v --redefine-syms ${PROJECT_BINARY_DIR}/objcopy.def  ${PROJECT_BINARY_DIR}/lib/lib${OpenBLAS_LIBNAME}.so
-    COMMENT "renaming symbols"
-    )
-  else()
-  add_custom_command(TARGET ${OpenBLAS_LIBNAME}_shared POST_BUILD
-    COMMAND perl ${PROJECT_SOURCE_DIR}/exports/gensymbol.pl "objcopy" "${ARCH}" "${BU}" "${EXPRECISION_IN}" "${NO_CBLAS_IN}" "${NO_LAPACK_IN}" "${NO_LAPACKE_IN}" "${NEED2UNDERSCORES_IN}" "${ONLY_CBLAS_IN}" \"${SYMBOLPREFIX}\" \"${SYMBOLSUFFIX}\" "${BLD}" "${BBF16}" "${BS}" "${BD}" "${BC}" "${BZ}" > ${PROJECT_BINARY_DIR}/objcopy.def
-    COMMAND objcopy -v --redefine-syms ${PROJECT_BINARY_DIR}/objcopy.def  ${PROJECT_BINARY_DIR}/lib/lib${OpenBLAS_LIBNAME}.so
-    COMMENT "renaming symbols"
-    )
-  endif()
-endif()
-

+# TODO: Why is the config saved here? Is this necessary with CMake?
+#Save the config files for installation
+#	@cp Makefile.conf Makefile.conf_last
+#	@cp config.h config_last.h
+#ifdef QUAD_PRECISION
+#	@echo "#define QUAD_PRECISION">> config_last.h
+#endif
+#ifeq ($(EXPRECISION), 1)
+#	@echo "#define EXPRECISION">> config_last.h
+#endif
+###
+#ifeq ($(DYNAMIC_ARCH), 1)
+#	@$(MAKE) -C kernel commonlibs || exit 1
+#	@for d in $(DYNAMIC_CORE) ; \
+#	do  $(MAKE) GOTOBLAS_MAKEFILE= -C kernel TARGET_CORE=$$d kernel || exit 1 ;\
+#	done
+#	@echo DYNAMIC_ARCH=1 >> Makefile.conf_last
+#endif
+#ifdef USE_THREAD
+#	@echo USE_THREAD=$(USE_THREAD) >>  Makefile.conf_last
+#endif
+#	@touch lib.grd

 # Install project

 # Install libraries
-if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS)
-  install(TARGETS ${OpenBLAS_LIBNAME}_shared
-    EXPORT "OpenBLAS${SUFFIX64}Targets"
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-  install(TARGETS ${OpenBLAS_LIBNAME}_static
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-else()
-  install(TARGETS ${OpenBLAS_LIBS}
-    EXPORT "OpenBLAS${SUFFIX64}Targets"
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-endif()
+install(TARGETS ${OpenBLAS_LIBNAME}
+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )

-# Install headers
-set(CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/openblas${SUFFIX64})
-set(CMAKE_INSTALL_FULL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
+# Install include files
+	set (GENCONFIG_BIN ${CMAKE_BINARY_DIR}/gen_config_h${CMAKE_EXECUTABLE_SUFFIX})
+	ADD_CUSTOM_COMMAND(
+	OUTPUT ${CMAKE_BINARY_DIR}/openblas_config.h
+	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/config.h
+	COMMAND ${GENCONFIG_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/config.h ${CMAKE_CURRENT_SOURCE_DIR}/openblas_config_template.h > ${CMAKE_BINARY_DIR}/openblas_config.h
+	)

-message(STATUS "Generating openblas_config.h in ${CMAKE_INSTALL_INCLUDEDIR}")
+	ADD_CUSTOM_TARGET(genconfig
+	ALL
+	DEPENDS openblas_config.h
+	)
+	add_dependencies(genconfig ${OpenBLAS_LIBNAME})

-set(OPENBLAS_CONFIG_H ${CMAKE_BINARY_DIR}/openblas_config.h)
-file(WRITE  ${OPENBLAS_CONFIG_H} "#ifndef OPENBLAS_CONFIG_H\n")
-file(APPEND ${OPENBLAS_CONFIG_H} "#define OPENBLAS_CONFIG_H\n")
-file(STRINGS ${PROJECT_BINARY_DIR}/config.h __lines)
-foreach(line ${__lines})
-  string(REPLACE "#define " "" line ${line})
-  file(APPEND ${OPENBLAS_CONFIG_H} "#define OPENBLAS_${line}\n")
-endforeach()
-file(APPEND ${OPENBLAS_CONFIG_H} "#define OPENBLAS_VERSION \"OpenBLAS ${OpenBLAS_VERSION}\"\n")
-file(READ   ${CMAKE_CURRENT_SOURCE_DIR}/openblas_config_template.h OPENBLAS_CONFIG_TEMPLATE_H_CONTENTS)
-file(APPEND ${OPENBLAS_CONFIG_H} "${OPENBLAS_CONFIG_TEMPLATE_H_CONTENTS}\n")
-file(APPEND ${OPENBLAS_CONFIG_H} "#endif /* OPENBLAS_CONFIG_H */\n")
-install (FILES ${OPENBLAS_CONFIG_H} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+	install (FILES ${CMAKE_BINARY_DIR}/openblas_config.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

-if(NOT NOFORTRAN)
-  message(STATUS "Generating f77blas.h in ${CMAKE_INSTALL_INCLUDEDIR}")
+	message(STATUS "Generating f77blas.h in ${CMAKE_INSTALL_INCLUDEDIR}")

-  set(F77BLAS_H ${CMAKE_BINARY_DIR}/generated/f77blas.h)
-  file(WRITE  ${F77BLAS_H} "#ifndef OPENBLAS_F77BLAS_H\n")
-  file(APPEND ${F77BLAS_H} "#define OPENBLAS_F77BLAS_H\n")
-  file(APPEND ${F77BLAS_H} "#include \"openblas_config.h\"\n")
-  file(READ ${CMAKE_CURRENT_SOURCE_DIR}/common_interface.h COMMON_INTERFACE_H_CONTENTS)
-  file(APPEND ${F77BLAS_H} "${COMMON_INTERFACE_H_CONTENTS}\n")
-  file(APPEND ${F77BLAS_H} "#endif")
-  install (FILES ${F77BLAS_H} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-endif()
+	ADD_CUSTOM_TARGET(genf77blas
+	ALL
+	COMMAND ${AWK} 'BEGIN{print \"\#ifndef OPENBLAS_F77BLAS_H\" \; print \"\#define OPENBLAS_F77BLAS_H\" \; print \"\#include \\"openblas_config.h\\" \"}; NF {print}; END{print \"\#endif\"}' ${CMAKE_CURRENT_SOURCE_DIR}/common_interface.h > ${CMAKE_BINARY_DIR}/f77blas.h
+	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/config.h
+	)
+	add_dependencies(genf77blas ${OpenBLAS_LIBNAME})
+
+	install (FILES ${CMAKE_BINARY_DIR}/f77blas.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

 if(NOT NO_CBLAS)
-  message (STATUS "Generating cblas.h in ${CMAKE_INSTALL_INCLUDEDIR}")
-  set(CBLAS_H ${CMAKE_BINARY_DIR}/generated/cblas.h)
-  file(READ ${CMAKE_CURRENT_SOURCE_DIR}/cblas.h CBLAS_H_CONTENTS)
-  string(REPLACE "common" "openblas_config" CBLAS_H_CONTENTS_NEW "${CBLAS_H_CONTENTS}")
-  if (NOT ${SYMBOLPREFIX} STREQUAL "")
-    string(REPLACE " cblas" " ${SYMBOLPREFIX}cblas" CBLAS_H_CONTENTS	"${CBLAS_H_CONTENTS_NEW}")
-    string(REPLACE " openblas" " ${SYMBOLPREFIX}openblas" CBLAS_H_CONTENTS_NEW	"${CBLAS_H_CONTENTS}")
-    string (REPLACE " ${SYMBOLPREFIX}openblas_complex" " openblas_complex" CBLAS_H_CONTENTS	"${CBLAS_H_CONTENTS_NEW}")
-    string(REPLACE " goto" " ${SYMBOLPREFIX}goto" CBLAS_H_CONTENTS_NEW "${CBLAS_H_CONTENTS}")
-  endif()
-  if (NOT ${SYMBOLSUFFIX} STREQUAL "")
-    string(REGEX REPLACE "(cblas[^ (]*)" "\\1${SYMBOLSUFFIX}" CBLAS_H_CONTENTS	"${CBLAS_H_CONTENTS_NEW}")
-    string(REGEX REPLACE "(openblas[^ (]*)" "\\1${SYMBOLSUFFIX}" CBLAS_H_CONTENTS_NEW "${CBLAS_H_CONTENTS}")
-    string(REGEX REPLACE "(openblas_complex[^ ]*)${SYMBOLSUFFIX}" "\\1" CBLAS_H_CONTENTS	"${CBLAS_H_CONTENTS_NEW}")
-    string(REGEX REPLACE "(goto[^ (]*)" "\\1${SYMBOLSUFFIX}" CBLAS_H_CONTENTS_NEW	"${CBLAS_H_CONTENTS}")
-  endif()
-  file(WRITE ${CBLAS_H} "${CBLAS_H_CONTENTS_NEW}")
-  install (FILES ${CBLAS_H} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+	message (STATUS "Generating cblas.h in ${CMAKE_INSTALL_INCLUDEDIR}")
+
+	ADD_CUSTOM_TARGET(gencblas
+	ALL
+	COMMAND ${SED} 's/common/openblas_config/g' ${CMAKE_CURRENT_SOURCE_DIR}/cblas.h > "${CMAKE_BINARY_DIR}/cblas.tmp"
+	COMMAND cp "${CMAKE_BINARY_DIR}/cblas.tmp" "${CMAKE_BINARY_DIR}/cblas.h"
+	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/cblas.h
+	)
+	add_dependencies(gencblas ${OpenBLAS_LIBNAME})
+
+	install (FILES ${CMAKE_BINARY_DIR}/cblas.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 endif()

 if(NOT NO_LAPACKE)
-  message (STATUS "Copying LAPACKE header files to ${CMAKE_INSTALL_INCLUDEDIR}")
-  if(BUILD_STATIC_LIBS)
-    add_dependencies( ${OpenBLAS_LIBNAME}_static genlapacke)
-  endif()
-  if(BUILD_SHARED_LIBS)
-    add_dependencies( ${OpenBLAS_LIBNAME}_shared genlapacke)
-  endif()
-  FILE(GLOB_RECURSE INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/lapack-netlib/LAPACKE/*.h")
-  install (FILES ${INCLUDE_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
-  ADD_CUSTOM_TARGET(genlapacke
-  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/lapack-netlib/LAPACKE/include/lapacke_mangling_with_flags.h.in "${CMAKE_BINARY_DIR}/lapacke_mangling.h"
-  )
-  install (FILES ${CMAKE_BINARY_DIR}/lapacke_mangling.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openblas${SUFFIX64})
+	message (STATUS "Copying LAPACKE header files to ${CMAKE_INSTALL_INCLUDEDIR}")
+	add_dependencies( ${OpenBLAS_LIBNAME} genlapacke)
+	FILE(GLOB_RECURSE INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/lapack-netlib/LAPACKE/*.h")
+	install (FILES ${INCLUDE_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+	ADD_CUSTOM_TARGET(genlapacke
+	COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/lapack-netlib/LAPACKE/include/lapacke_mangling_with_flags.h.in "${CMAKE_BINARY_DIR}/lapacke_mangling.h"
+	)
+	install (FILES ${CMAKE_BINARY_DIR}/lapacke_mangling.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+endif()
+ 
+if(NOT MSVC)
+	install (TARGETS ${OpenBLAS_LIBNAME}_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()

-# Install pkg-config files
-configure_file(${PROJECT_SOURCE_DIR}/cmake/openblas.pc.in ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc @ONLY)
-install (FILES ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/)
-
-
-# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
-set(PN OpenBLAS)
-set(CMAKECONFIG_INSTALL_DIR "share/cmake/${PN}${SUFFIX64}")
-configure_package_config_file(cmake/${PN}Config.cmake.in
-                              "${CMAKE_CURRENT_BINARY_DIR}/${PN}${SUFFIX64}Config.cmake"
-                              INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR})
-write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PN}ConfigVersion.cmake
-                                 VERSION ${${PN}_VERSION}
-                                 COMPATIBILITY AnyNewerVersion)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PN}${SUFFIX64}Config.cmake
-        DESTINATION ${CMAKECONFIG_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PN}ConfigVersion.cmake
-        RENAME ${PN}${SUFFIX64}ConfigVersion.cmake
-        DESTINATION ${CMAKECONFIG_INSTALL_DIR})
-install(EXPORT "${PN}${SUFFIX64}Targets"
-        NAMESPACE "${PN}${SUFFIX64}::"
-        DESTINATION ${CMAKECONFIG_INSTALL_DIR})
+include(FindPkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+	configure_file(${PROJECT_SOURCE_DIR}/cmake/openblas.pc.in ${PROJECT_BINARY_DIR}/openblas.pc @ONLY)
+	install (FILES ${PROJECT_BINARY_DIR}/openblas.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/)
+endif()
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -23,9 +23,6 @@
  * Optimization on AMD Piledriver
  * Optimization on Intel Haswell

-* Chris Sidebottom <chris.sidebottom@arm.com>
-  * Optimizations and other improvements targeting AArch64
-
 ## Previous Developers

 * Zaheer Chothia <zaheer.chothia@gmail.com>
@@ -169,50 +166,5 @@ In chronological order:
  * [2017-01-01] dgemm and dtrmm kernels for IBM z13
  * [2017-02-26] ztrmm kernel for IBM z13
  * [2017-03-13] strmm and ctrmm kernel for IBM z13
-  * [2017-09-01] initial Blas Level-1,2 (double precision) for IBM z13
-  * [2018-03-07] added missing Blas Level 1-2  (double precision) simd codes
-  * [2019-02-01] added missing Blas Level-1,2 (single precision)  simd codes
-  * [2019-03-14] power9 dgemm/dtrmm kernel
-  * [2019-04-29] power9 sgemm/strmm kernel 

-* Jiachen Wang <https://github.com/wjc404>
-  * [2019-07-29] optimize AVX2 DGEMM
-  * [2019-10-20] AVX512 DGEMM kernel (4x8)
-  * [2019-11-06] optimize AVX512 SGEMM
-  * [2019-11-12] AVX512 CGEMM & ZGEMM kernels
-  * [2019-12-23] optimize AVX2 CGEMM and ZGEMM
-  * [2019-12-30] AVX2 CGEMM3M & ZGEMM3M kernels
-  * [2020-01-07] optimize AVX2 SGEMM and STRMM

-* Rajalakshmi Srinivasaraghavan <https://github.com/RajalakshmiSR>
-  * [2020-04-15] Half-precision GEMM for bfloat16
-
-* Marius Hillenbrand <https://github.com/mhillenibm>
-  * [2020-05-12] Revise dynamic architecture detection for IBM z
-  * [2020-05-12] Add new sgemm and strmm kernel for IBM z14
-  * [2020-09-07] Fix builds with clang on IBM z, including dynamic architecture support
-
-* Danfeng Zhang <https://github.com/craft-zhang>
-  * [2020-05-20] Improve performance of SGEMM and STRMM on Arm Cortex-A53
-
-* PingTouGe Semiconductor Co., Ltd.
-  * [2020-10] Add RISC-V Vector (0.7.1) support. Optimize BLAS kernels for Xuantie C910
-
-* River Dillon <oss@outerpassage.net>
-  * [2021-07-10] fix compilation with musl libc
-
-* Bine Brank <https://github.com/binebrank>
-  * [2021-10-27] Add vector-length-agnostic DGEMM kernels for Arm SVE
-  * [2021-11-20] Vector-length-agnostic Arm SVE copy routines for DGEMM, DTRMM, DSYMM
-  * [2021-11-12] SVE kernels for SGEMM, STRMM and corresponding SVE copy functions
-  * [2022-01-06] SVE kernels for CGEMM, ZGEMM, CTRMM, ZTRMM and corresponding SVE copy functions
-  * [2022-01-18] SVE kernels and copy functions for TRSM
-
-* Ilya Kurdyukov <https://github.com/ilyakurdyukov>
-  * [2021-02-21] Add basic support for the Elbrus E2000 architecture
-
-* PLCT Lab, Institute of Software Chinese Academy of Sciences
-  * [2022-03] Support RISC-V Vector Intrinisc 1.0 version.
-  
-* Pablo Romero <https://github.com/pablorcum>
-  * [2022-08] Fix building from sources for QNX
--- a/Changelog.txt
+++ b/Changelog.txt
--- a/GotoBLAS_01Readme.txt
+++ b/GotoBLAS_01Readme.txt
@@ -80,7 +80,7 @@
                      SUN
                      Fujitsu

-4. Supported precision
+4. Suported precision

 Now x86/x86_64 version support 80bit FP precision in addition to
 normal double presicion and single precision. Currently only
--- a/9
+++ b/9
@@ -1,9 +0,0 @@
-node {
-        stage('Checkout') {
-            checkout
-        }
-
-        stage('Build') {
-            sh("make")
-        }
-}
--- a/180
+++ b/180
@@ -21,28 +21,14 @@ ifeq ($(BUILD_RELAPACK), 1)
 RELA = re_lapack
 endif

-ifeq ($(NO_FORTRAN), 1)
-define NOFORTRAN
-1
-endef
-ifneq ($(NO_LAPACK), 1)
-define C_LAPACK
-1
-endef
-endif
-export NOFORTRAN
-export NO_LAPACK
-export C_LAPACK
-endif
+LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS))

-LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS))
-
-SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test
+SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench

 .PHONY : all libs netlib $(RELA) test ctest shared install
-.NOTPARALLEL : shared
+.NOTPARALLEL : all libs $(RELA) prof lapack-test install blas-test

-all :: tests
+all :: libs netlib $(RELA) tests shared
 	@echo
 	@echo " OpenBLAS build complete. ($(LIB_COMPONENTS))"
 	@echo
@@ -59,27 +45,10 @@ ifneq ($(INTERFACE64), 0)
 	@echo "  Use 64 bits int    (equivalent to \"-i8\" in Fortran)      "
 endif
 endif
-	@$(CC) --version > /dev/null 2>&1;\
-	if [ $$? -eq 0 ]; then \
-	   cverinfo=`$(CC) --version | sed -n '1p'`; \
-	   if [ -z "$${cverinfo}" ]; then \
-	   cverinfo=`$(CC) --version | sed -n '2p'`; \
-	   fi; \
-	   echo "  C compiler       ... $(C_COMPILER)  (cmd & version : $${cverinfo})";\
-	else  \
-	   echo "  C compiler       ... $(C_COMPILER)  (command line : $(CC))";\
-	fi
-ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
-	@$(FC) --version > /dev/null 2>&1;\
-	if [ $$? -eq 0 ]; then \
-	   fverinfo=`$(FC) --version | sed -n '1p'`; \
-	   if [ -z "$${fverinfo}" ]; then \
-	   fverinfo=`$(FC) --version | sed -n '2p'`; \
-	   fi; \
-	   echo "  Fortran compiler ... $(F_COMPILER)  (cmd & version : $${fverinfo})";\
-	else \
-	   echo "  Fortran compiler ... $(F_COMPILER)  (command line : $(FC))";\
-	fi
+
+	@echo "  C compiler       ... $(C_COMPILER)  (command line : $(CC))"
+ifndef NOFORTRAN
+	@echo "  Fortran compiler ... $(F_COMPILER)  (command line : $(FC))"
 endif
 ifneq ($(OSNAME), AIX)
 	@echo -n "  Library Name     ... $(LIBNAME)"
@@ -88,13 +57,9 @@ else
 endif

 ifndef SMP
-	@echo " (Single-threading)  "
+	@echo " (Single threaded)  "
 else
-	@echo " (Multi-threading; Max num-threads is $(NUM_THREADS))"
-endif
-
-ifeq ($(DYNAMIC_ARCH), 1)
-	@echo "  Supporting multiple $(ARCH) cpu models with minimum requirement for the common code being $(CORE)"
+	@echo " (Multi threaded; Max num-threads is $(NUM_THREADS))"
 endif

 ifeq ($(USE_OPENMP), 1)
@@ -110,10 +75,6 @@ ifeq ($(OSNAME), Darwin)
 	@echo "\"make PREFIX=/your_installation_path/ install\"."
 	@echo
 	@echo "(or set PREFIX in Makefile.rule and run make install."
-	@echo
-	@echo "Note that any flags passed to make during build should also be passed to make install"
-	@echo "to circumvent any install errors."
-	@echo
 	@echo "If you want to move the .dylib to a new location later, make sure you change"
 	@echo "the internal name of the dylib with:"
 	@echo
@@ -122,25 +83,25 @@ endif
 	@echo
 	@echo "To install the library, you can run \"make PREFIX=/path/to/your/installation install\"."
 	@echo
-	@echo "Note that any flags passed to make during build should also be passed to make install"
-	@echo "to circumvent any install errors."
-	@echo

-shared : libs netlib $(RELA)
-ifneq ($(NO_SHARED), 1)
-ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android Haiku FreeBSD DragonFly))
+shared :
+ifndef NO_SHARED
+ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android))
 	@$(MAKE) -C exports so
 	@ln -fs $(LIBSONAME) $(LIBPREFIX).so
 	@ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
 endif
-ifeq ($(OSNAME), $(filter $(OSNAME),OpenBSD NetBSD))
+ifeq ($(OSNAME), FreeBSD)
+	@$(MAKE) -C exports so
+	@ln -fs $(LIBSONAME) $(LIBPREFIX).so
+endif
+ifeq ($(OSNAME), NetBSD)
 	@$(MAKE) -C exports so
 	@ln -fs $(LIBSONAME) $(LIBPREFIX).so
 endif
 ifeq ($(OSNAME), Darwin)
 	@$(MAKE) -C exports dyn
 	@ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib
-	@ln -fs $(LIBDYNNAME) $(LIBPREFIX).$(MAJOR_VERSION).dylib
 endif
 ifeq ($(OSNAME), WINNT)
 	@$(MAKE) -C exports dll
@@ -150,37 +111,31 @@ ifeq ($(OSNAME), CYGWIN_NT)
 endif
 endif

-tests : shared
-ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
+tests :
+ifndef NOFORTRAN
 	touch $(LIBNAME)
 ifndef NO_FBLAS
 	$(MAKE) -C test all
-endif
-endif
-ifneq ($(ONLY_CBLAS), 1)
 	$(MAKE) -C utest all
 endif
-ifneq ($(NO_CBLAS), 1)
-ifneq ($(ONLY_CBLAS), 1)
+ifndef NO_CBLAS
 	$(MAKE) -C ctest all
 endif
-ifeq ($(CPP_THREAD_SAFETY_TEST), 1)
-	$(MAKE) -C cpp_thread_test all
-endif
 endif

 libs :
-ifeq ($(CORE), UNKNOWN)
+ifeq ($(CORE), UNKOWN)
 	$(error OpenBLAS: Detecting CPU failed. Please set TARGET explicitly, e.g. make TARGET=your_cpu_target. Please read README for the detail.)
 endif
 ifeq ($(NOFORTRAN), 1)
-	$(info OpenBLAS: Detecting fortran compiler failed. Can only compile BLAS and f2c-converted LAPACK.)
+	$(info OpenBLAS: Detecting fortran compiler failed. Cannot compile LAPACK. Only compile BLAS.)
 endif
 ifeq ($(NO_STATIC), 1)
 ifeq ($(NO_SHARED), 1)
 	$(error OpenBLAS: neither static nor shared are enabled.)
 endif
 endif
+	@-ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
 	@for d in $(SUBDIRS) ; \
 	do if test -d $$d; then \
 	  $(MAKE) -C $$d $(@F) || exit 1 ; \
@@ -202,14 +157,10 @@ ifeq ($(DYNAMIC_ARCH), 1)
 	do  $(MAKE) GOTOBLAS_MAKEFILE= -C kernel TARGET_CORE=$$d kernel || exit 1 ;\
 	done
 	@echo DYNAMIC_ARCH=1 >> Makefile.conf_last
-ifeq ($(DYNAMIC_OLDER), 1)
-	@echo DYNAMIC_OLDER=1 >> Makefile.conf_last
-endif	
 endif
 ifdef USE_THREAD
 	@echo USE_THREAD=$(USE_THREAD) >>  Makefile.conf_last
 endif
-	@-ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
 	@touch lib.grd

 prof : prof_blas prof_lapack
@@ -255,14 +206,19 @@ hpl_p :
 	fi; \
 	done

+ifeq ($(NO_LAPACK), 1)
+netlib :
+
+else
 netlib : lapack_prebuild
-ifneq ($(NO_LAPACK), 1)
+ifndef NOFORTRAN
 	@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
 	@$(MAKE) -C $(NETLIB_LAPACK_DIR) tmglib
 endif
-ifneq ($(NO_LAPACKE), 1)
+ifndef NO_LAPACKE
 	@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapackelib
 endif
+endif

 ifeq ($(NO_LAPACK), 1)
 re_lapack :
@@ -276,31 +232,22 @@ prof_lapack : lapack_prebuild
 	@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof

 lapack_prebuild :
-ifeq ($(NO_LAPACK), $(filter 0,$(NO_LAPACK)))
-	-@echo "FC          = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
-ifeq ($(F_COMPILER), GFORTRAN)
-	-@echo "override FFLAGS      = $(LAPACK_FFLAGS) -fno-tree-vectorize" >> $(NETLIB_LAPACK_DIR)/make.inc
-else
-	-@echo "override FFLAGS      = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-	-@echo "FFLAGS_DRV  = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
+ifndef NOFORTRAN
+	-@echo "FORTRAN     = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
+	-@echo "OPTS        = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "POPTS       = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-	-@echo "FFLAGS_NOOPT       = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc
+	-@echo "NOOPT       = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "PNOOPT      = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
-ifeq ($(C_COMPILER)$(F_COMPILER)$(USE_OPENMP), CLANGGFORTRAN1)
-	-@echo "LDFLAGS     = $(FFLAGS) $(EXTRALIB) -lomp" >> $(NETLIB_LAPACK_DIR)/make.inc
-else
-	-@echo "LDFLAGS     = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
+	-@echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "override CFLAGS      = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-	-@echo "AR          = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
-	-@echo "ARFLAGS     = $(ARFLAGS) -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
+	-@echo "ARCH        = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
+	-@echo "ARCHFLAGS   = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
-	-@echo "LAPACKLIB   = ../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
-	-@echo "TMGLIB      = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
+	-@echo "LAPACKLIB   = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
+	-@echo "TMGLIB      = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "BLASLIB     = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
-	-@echo "LAPACKELIB  = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
+	-@echo "LAPACKELIB  = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "SUFFIX      = $(SUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "PSUFFIX     = $(PSUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
@@ -310,8 +257,6 @@ ifeq ($(F_COMPILER), GFORTRAN)
 ifdef SMP
 ifeq ($(OSNAME), WINNT)
 	-@echo "LOADER      = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
-else ifeq ($(OSNAME), Haiku)
-	-@echo "LOADER      = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
 else
 	-@echo "LOADER      = $(FC) -pthread" >> $(NETLIB_LAPACK_DIR)/make.inc
 endif
@@ -325,38 +270,25 @@ endif
 ifeq ($(BUILD_LAPACK_DEPRECATED), 1)
 	-@echo "BUILD_DEPRECATED      = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
 endif
-ifeq ($(BUILD_SINGLE), 1)
-	-@echo "BUILD_SINGLE      = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-ifeq ($(BUILD_DOUBLE), 1)
-	-@echo "BUILD_DOUBLE      = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-ifeq ($(BUILD_COMPLEX), 1)
-	-@echo "BUILD_COMPLEX      = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-ifeq ($(BUILD_COMPLEX16), 1)
-	-@echo "BUILD_COMPLEX16      = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-	-@echo "LAPACKE_WITH_TMG      = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@cat  make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
 endif

 large.tgz :
-ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
+ifndef NOFORTRAN
 	if [ ! -a $< ]; then
 	-wget http://www.netlib.org/lapack/timing/large.tgz;
 	fi
 endif

 timing.tgz :
-ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
+ifndef NOFORTRAN
 	if [ ! -a $< ]; then
 	-wget http://www.netlib.org/lapack/timing/timing.tgz;
 	fi
 endif

 lapack-timing : large.tgz timing.tgz
-ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
+ifndef NOFORTRAN
 	(cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING)
 	(cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz )
 	$(MAKE) -C $(NETLIB_LAPACK_DIR)/TIMING
@@ -365,24 +297,23 @@ endif

 lapack-test :
 	(cd $(NETLIB_LAPACK_DIR)/TESTING && rm -f x* *.out)
-	$(MAKE) -j 1 -C $(NETLIB_LAPACK_DIR)/TESTING/EIG xeigtstc  xeigtstd  xeigtsts  xeigtstz 
-	$(MAKE) -j 1 -C $(NETLIB_LAPACK_DIR)/TESTING/LIN xlintstc  xlintstd  xlintstds  xlintstrfd  xlintstrfz  xlintsts  xlintstz  xlintstzc xlintstrfs xlintstrfc
+	$(MAKE) -j 1 -C $(NETLIB_LAPACK_DIR)/TESTING xeigtstc  xeigtstd  xeigtsts  xeigtstz  xlintstc  xlintstd  xlintstds  xlintstrfd  xlintstrfz  xlintsts  xlintstz  xlintstzc xlintstrfs xlintstrfc
 ifneq ($(CROSS), 1)
-	( cd $(NETLIB_LAPACK_DIR)/INSTALL; $(MAKE) all; ./testlsame; ./testslamch; ./testdlamch; \
-        ./testsecond; ./testdsecnd; ./testieee; ./testversion )
-	(cd $(NETLIB_LAPACK_DIR); ./lapack_testing.py -r -b TESTING)
-endif
-
-lapack-runtest: lapack-test
 	( cd $(NETLIB_LAPACK_DIR)/INSTALL; ./testlsame; ./testslamch; ./testdlamch; \
        ./testsecond; ./testdsecnd; ./testieee; ./testversion )
-	(cd $(NETLIB_LAPACK_DIR); ./lapack_testing.py -r -b TESTING )
+	(cd $(NETLIB_LAPACK_DIR); ./lapack_testing.py -r )
+endif
+
+lapack-runtest:
+	( cd $(NETLIB_LAPACK_DIR)/INSTALL; ./testlsame; ./testslamch; ./testdlamch; \
+        ./testsecond; ./testdsecnd; ./testieee; ./testversion )
+	(cd $(NETLIB_LAPACK_DIR); ./lapack_testing.py -r )


 blas-test:
-	(cd $(NETLIB_LAPACK_DIR)/BLAS/TESTING && rm -f x* *.out)
+	(cd $(NETLIB_LAPACK_DIR)/BLAS && rm -f x* *.out)
 	$(MAKE) -j 1 -C $(NETLIB_LAPACK_DIR) blas_testing
-	(cd $(NETLIB_LAPACK_DIR)/BLAS/TESTING && cat *.out)
+	(cd $(NETLIB_LAPACK_DIR)/BLAS && cat *.out)


 dummy :
@@ -400,12 +331,11 @@ clean ::
 	@$(MAKE) -C kernel clean
 #endif
 	@$(MAKE) -C reference clean
-	@rm -f *.$(LIBSUFFIX) *.so *~ *.exe getarch getarch_2nd *.dll *.lib *.$(SUFFIX) *.dwf $(LIBPREFIX).$(LIBSUFFIX) $(LIBPREFIX)_p.$(LIBSUFFIX) $(LIBPREFIX).so.$(MAJOR_VERSION) *.lnk myconfig.h *.so.renamed *.a.renamed *.so.0
+	@rm -f *.$(LIBSUFFIX) *.so *~ *.exe getarch getarch_2nd *.dll *.lib *.$(SUFFIX) *.dwf $(LIBPREFIX).$(LIBSUFFIX) $(LIBPREFIX)_p.$(LIBSUFFIX) $(LIBPREFIX).so.$(MAJOR_VERSION) *.lnk myconfig.h
 ifeq ($(OSNAME), Darwin)
 	@rm -rf getarch.dSYM getarch_2nd.dSYM
 endif
 	@rm -f Makefile.conf config.h Makefile_kernel.conf config_kernel.h st* *.dylib
-	@rm -f cblas.tmp cblas.tmp2
 	@touch $(NETLIB_LAPACK_DIR)/make.inc
 	@$(MAKE) -C $(NETLIB_LAPACK_DIR) clean
 	@rm -f $(NETLIB_LAPACK_DIR)/make.inc $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_mangling.h
--- a/Makefile.L3
+++ b/Makefile.L3
--- a/Makefile.alpha
+++ b/Makefile.alpha
@@ -1,24 +1,42 @@
+CPP	= $(CC) -E
+RANLIB  = ranlib
+
+ifeq ($(LIBSUBARCH), EV4)
+LIBNAME		= $(LIBPREFIX)_ev4.a
+LIBNAME_P	= $(LIBPREFIX)_ev4_p.a
+endif
+
+ifeq ($(LIBSUBARCH), EV5)
+LIBNAME		= $(LIBPREFIX)_ev5.a
+LIBNAME_P	= $(LIBPREFIX)_ev5_p.a
+endif
+
+ifeq ($(LIBSUBARCH), EV6)
+LIBNAME		= $(LIBPREFIX)_ev6.a
+LIBNAME_P	= $(LIBPREFIX)_ev6_p.a
+endif
+
 ifneq ($(COMPILER), NATIVE)
 # GCC User
-ifeq ($(CORE), EV4)
-CCOMMON_OPT += -mcpu=ev4
+ifeq ($(LIBSUBARCH), EV4)
+OPTION += -DEV4 -mcpu=ev4
 endif
-ifeq ($(CORE), EV5)
-CCOMMON_OPT += -mcpu=ev5
+ifeq ($(LIBSUBARCH), EV5)
+OPTION += -DEV5 -mcpu=ev5
 endif
-ifeq ($(CORE), EV6)
-CCOMMON_OPT += -mcpu=ev6
+ifeq ($(LIBSUBARCH), EV6)
+OPTION += -DEV6 -mcpu=ev6
 endif
 else
 # Compaq Compiler User
-ifeq ($(CORE), EV4)
-CCOMMON_OPT += -tune ev4 -arch ev4
+ifeq ($(LIBSUBARCH), EV4)
+OPTION += -DEV4 -tune ev4 -arch ev4
 endif
-ifeq ($(CORE), EV5)
-CCOMMON_OPT += -tune ev5 -arch ev5
+ifeq ($(LIBSUBARCH), EV5)
+OPTION += -DEV5 -tune ev5 -arch ev5
 endif
-ifeq ($(CORE), EV6)
-CCOMMON_OPT += -tune ev6 -arch ev6
+ifeq ($(LIBSUBARCH), EV6)
+OPTION += -DEV6 -tune ev6 -arch ev6
 endif
 endif

--- a/Makefile.arm
+++ b/Makefile.arm
@@ -1,7 +1,7 @@
 ifeq ($(CORE), $(filter $(CORE),ARMV7 CORTEXA9 CORTEXA15))
 ifeq ($(OSNAME), Android)
-CCOMMON_OPT += -mfpu=neon -march=armv7-a
-FCOMMON_OPT += -mfpu=neon -march=armv7-a
+CCOMMON_OPT += -mfpu=neon  -march=armv7-a
+FCOMMON_OPT += -mfpu=neon  -march=armv7-a
 else
 CCOMMON_OPT += -mfpu=vfpv3 -march=armv7-a
 FCOMMON_OPT += -mfpu=vfpv3 -march=armv7-a
@@ -9,11 +9,11 @@ endif
 endif

 ifeq ($(CORE), ARMV6)
-CCOMMON_OPT += -mfpu=vfp
-FCOMMON_OPT += -mfpu=vfp
+CCOMMON_OPT += -mfpu=vfp -march=armv6
+FCOMMON_OPT += -mfpu=vfp -march=armv6
 endif

-ifdef HAVE_NEON
-CCOMMON_OPT += -mfpu=neon
-FCOMMON_OPT += -mfpu=neon
+ifeq ($(CORE), ARMV5)
+CCOMMON_OPT += -march=armv5
+FCOMMON_OPT += -march=armv5
 endif
--- a/Makefile.arm64
+++ b/Makefile.arm64
@@ -1,285 +1,25 @@
-ifneq ($(C_COMPILER), PGI)
-
-ifeq ($(C_COMPILER), CLANG)
-ISCLANG=1
-endif
-ifeq ($(C_COMPILER), FUJITSU)
-ISCLANG=1
-endif
-ifneq (1, $(filter 1,$(GCCVERSIONGT4) $(ISCLANG)))
-CCOMMON_OPT += -march=armv8-a
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8-a
-endif
-
-
-else 
-

 ifeq ($(CORE), ARMV8)
 CCOMMON_OPT += -march=armv8-a
-ifneq ($(F_COMPILER), NAG)
 FCOMMON_OPT += -march=armv8-a
 endif
-endif
-
-ifeq ($(CORE), ARMV8SVE)
-CCOMMON_OPT += -march=armv8-a+sve
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8-a+sve
-endif
-endif
-
-ifeq ($(CORE), CORTEXA53)
-CCOMMON_OPT += -march=armv8-a -mtune=cortex-a53
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8-a -mtune=cortex-a53
-endif
-endif

 ifeq ($(CORE), CORTEXA57)
-CCOMMON_OPT += -march=armv8-a -mtune=cortex-a57
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8-a -mtune=cortex-a57
-endif
+CCOMMON_OPT += -march=armv8-a+crc+crypto+fp+simd -mtune=cortex-a57
+FCOMMON_OPT += -march=armv8-a+crc+crypto+fp+simd -mtune=cortex-a57
 endif

-ifeq ($(CORE), CORTEXA72)
-CCOMMON_OPT += -march=armv8-a -mtune=cortex-a72
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8-a -mtune=cortex-a72
-endif
-endif
-
-ifeq ($(CORE), CORTEXA73)
-CCOMMON_OPT += -march=armv8-a -mtune=cortex-a73
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8-a -mtune=cortex-a73
-endif
-endif
-
-ifeq ($(CORE), FT2000)
-CCOMMON_OPT += -march=armv8-a -mtune=cortex-a72
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8-a -mtune=cortex-a72
-endif
-endif
-
-# Use a72 tunings because Neoverse-N1 is only available
-# in GCC>=9
-ifeq ($(CORE), NEOVERSEN1)
-ifeq (1, $(filter 1,$(GCCVERSIONGTEQ7) $(ISCLANG)))
-ifeq ($(GCCVERSIONGTEQ9), 1)
-CCOMMON_OPT += -march=armv8.2-a -mtune=neoverse-n1
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.2-a -mtune=neoverse-n1
-endif
-else
-CCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a72
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a72
-endif
-endif
-else
-CCOMMON_OPT += -march=armv8-a -mtune=cortex-a72
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8-a -mtune=cortex-a72
-endif
-endif
-endif
-
-# Use a72 tunings because Neoverse-V1 is only available
-# in GCC>=10.4
-ifeq ($(CORE), NEOVERSEV1)
-ifeq (1, $(filter 1,$(GCCVERSIONGTEQ7) $(ISCLANG)))
-ifeq ($(GCCVERSIONGTEQ10), 1)
-ifeq (1, $(filter 1,$(GCCMINORVERSIONGTEQ4) $(GCCVERSIONGTEQ11)))
-CCOMMON_OPT += -march=armv8.4-a+sve -mtune=neoverse-v1
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.4-a -mtune=neoverse-v1
-endif
-else
-CCOMMON_OPT += -march=armv8.4-a+sve -mtune=native
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.4-a -mtune=native
-endif
-endif
-else
-CCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a72
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a72
-endif
-endif
-else
-CCOMMON_OPT += -march=armv8-a -mtune=cortex-a72
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8-a -mtune=cortex-a72
-endif
-endif
-endif
-
-# Use a72 tunings because Neoverse-N2 is only available
-# in GCC>=10.4
-ifeq ($(CORE), NEOVERSEN2)
-ifeq (1, $(filter 1,$(GCCVERSIONGTEQ7) $(ISCLANG)))
-ifeq ($(GCCVERSIONGTEQ10), 1)
-ifeq (1, $(filter 1,$(GCCMINORVERSIONGTEQ4) $(GCCVERSIONGTEQ11)))
-ifneq ($(OSNAME), Darwin)
-CCOMMON_OPT += -march=armv8.5-a+sve+sve2+bf16 -mtune=neoverse-n2
-else
-CCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a72
-endif
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.5-a+sve+sve2+bf16 -mtune=neoverse-n2
-endif
-else
-CCOMMON_OPT += -march=armv8.5-a+sve -mtune=native
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.5-a -mtune=native
-endif
-endif
-else
-CCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a72
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a72
-endif
-endif
-else
-CCOMMON_OPT += -march=armv8-a -mtune=cortex-a72
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8-a -mtune=cortex-a72
-endif
-endif
-endif
-
-# Use a53 tunings because a55 is only available in GCC>=8.1
-ifeq ($(CORE), CORTEXA55)
-ifeq (1, $(filter 1,$(GCCVERSIONGTEQ7) $(ISCLANG)))
-ifeq ($(GCCVERSIONGTEQ8), 1)
-CCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a55
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a55
-endif
-else
-CCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a53
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a53
-endif
-endif
-else
-CCOMMON_OPT += -march=armv8-a -mtune=cortex-a53
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8-a -mtune=cortex-a53
-endif
-endif
+ifeq ($(CORE), VULCAN)
+CCOMMON_OPT += -mtune=vulcan -mcpu=vulcan
+FCOMMON_OPT += -mtune=vulcan -mcpu=vulcan
 endif

 ifeq ($(CORE), THUNDERX)
-CCOMMON_OPT += -march=armv8-a -mtune=thunderx
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8-a -mtune=thunderx
-endif
-endif
-
-ifeq ($(CORE), FALKOR)
-CCOMMON_OPT += -march=armv8-a -mtune=falkor
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8-a -mtune=falkor
-endif
+CCOMMON_OPT += -mtune=thunderx -mcpu=thunderx
+FCOMMON_OPT += -mtune=thunderx -mcpu=thunderx
 endif

 ifeq ($(CORE), THUNDERX2T99)
-CCOMMON_OPT += -march=armv8.1-a -mtune=thunderx2t99
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.1-a -mtune=thunderx2t99
-endif
-endif
-
-ifeq ($(CORE), THUNDERX3T110)
-ifeq ($(GCCVERSIONGTEQ10), 1)
-CCOMMON_OPT += -march=armv8.3-a -mtune=thunderx3t110
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.3-a -mtune=thunderx3t110
-endif
-else
-CCOMMON_OPT += -march=armv8.1-a -mtune=thunderx2t99
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.1-a -mtune=thunderx2t99
-endif
-endif
-endif
-
-ifeq ($(CORE), VORTEX)
-CCOMMON_OPT += -march=armv8.3-a
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.3-a
-endif
-endif
-
-ifeq (1, $(filter 1,$(GCCVERSIONGTEQ9) $(ISCLANG)))
-ifeq ($(CORE), TSV110)
-CCOMMON_OPT += -march=armv8.2-a -mtune=tsv110
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.2-a -mtune=tsv110
-endif
-endif
-endif
-
-ifeq ($(GCCVERSIONGTEQ9), 1)
-ifeq ($(CORE), EMAG8180)
-CCOMMON_OPT += -march=armv8-a -mtune=emag
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8-a -mtune=emag
-endif
-endif
-endif
-
-ifeq (1, $(filter 1,$(GCCVERSIONGTEQ11) $(ISCLANG)))
-ifeq ($(CORE), A64FX)
-CCOMMON_OPT += -march=armv8.2-a+sve -mtune=a64fx
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.2-a+sve -mtune=a64fx
-endif
-endif
-endif
-
-ifeq (1, $(filter 1,$(GCCVERSIONGTEQ11) $(ISCLANG)))
-ifeq ($(CORE), CORTEXX1)
-CCOMMON_OPT += -march=armv8.2-a -mtune=cortexa72
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.2-a -mtune=cortexa72
-endif
-endif
-endif
-
-ifeq (1, $(filter 1,$(GCCVERSIONGTEQ11) $(ISCLANG)))
-ifeq ($(CORE), CORTEXX2)
-CCOMMON_OPT += -march=armv8.4-a+sve
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.4-a+sve
-endif
-endif
-endif
-
-#ifeq (1, $(filter 1,$(ISCLANG)))
-ifeq (1, $(filter 1,$(GCCVERSIONGTEQ11) $(ISCLANG)))
-ifeq ($(CORE), CORTEXA510)
-CCOMMON_OPT += -march=armv8.4-a+sve
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.4-a+sve
-endif
-endif
-endif
-
-ifeq (1, $(filter 1,$(GCCVERSIONGTEQ11) $(ISCLANG)))
-ifeq ($(CORE), CORTEXA710)
-CCOMMON_OPT += -march=armv8.4-a+sve
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=armv8.4-a+sve
-endif
-endif
-endif
-
-endif
-
+CCOMMON_OPT += -mtune=thunderx2t99 -mcpu=thunderx2t99
+FCOMMON_OPT += -mtune=thunderx2t99 -mcpu=thunderx2t99
 endif
--- a/Makefile.e2k
+++ b/Makefile.e2k
@@ -1 +0,0 @@
-COPT	= -Wall -O2 # -DGEMMTEST
--- a/Makefile.install
+++ b/Makefile.install
@@ -9,23 +9,10 @@ OPENBLAS_INCLUDE_DIR := $(PREFIX)/include
 OPENBLAS_LIBRARY_DIR := $(PREFIX)/lib
 OPENBLAS_BINARY_DIR := $(PREFIX)/bin
 OPENBLAS_BUILD_DIR := $(CURDIR)
-OPENBLAS_CMAKE_DIR := $(OPENBLAS_LIBRARY_DIR)/cmake/$(LIBSONAMEBASE)
+OPENBLAS_CMAKE_DIR := $(OPENBLAS_LIBRARY_DIR)/cmake/openblas
 OPENBLAS_CMAKE_CONFIG := OpenBLASConfig.cmake
 OPENBLAS_CMAKE_CONFIG_VERSION := OpenBLASConfigVersion.cmake
 OPENBLAS_PKGCONFIG_DIR := $(OPENBLAS_LIBRARY_DIR)/pkgconfig
-PKG_EXTRALIB := $(EXTRALIB)
-ifeq ($(INTERFACE64),1)
-	SUFFIX64=64
-endif
-PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE)$(SUFFIX64).pc"
-
-ifeq ($(USE_OPENMP), 1)
-  ifeq ($(C_COMPILER), PGI)
-          PKG_EXTRALIB += -lomp
-  else	  
-          PKG_EXTRALIB += -lgomp
-  endif
-endif	  

 .PHONY : install
 .NOTPARALLEL : install
@@ -58,116 +45,66 @@ install : 	lib.grd

 ifndef NO_CBLAS
 	@echo Generating cblas.h in $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
-	@cp cblas.h cblas.tmp
-ifdef SYMBOLPREFIX
-	@sed 's/cblas[^( ]*/$(SYMBOLPREFIX)&/g' cblas.tmp > cblas.tmp2
-	@sed 's/openblas[^( ]*/$(SYMBOLPREFIX)&/g'  cblas.tmp2 > cblas.tmp
-	#change back any openblas_complex_float and double that got hit
-	@sed 's/$(SYMBOLPREFIX)openblas_complex_/openblas_complex_/g'  cblas.tmp > cblas.tmp2
-	@sed 's/goto[^( ]*/$(SYMBOLPREFIX)&/g'  cblas.tmp2 > cblas.tmp
-endif
-ifdef SYMBOLSUFFIX
-	@sed 's/cblas[^( ]*/&$(SYMBOLSUFFIX)/g' cblas.tmp > cblas.tmp2
-	@sed 's/openblas[^( ]*/&$(SYMBOLSUFFIX)/g'  cblas.tmp2 > cblas.tmp
-	#change back any openblas_complex_float and double that got hit
-	@sed 's/\(openblas_complex_\)\([^ ]*\)$(SYMBOLSUFFIX)/\1\2 /g'  cblas.tmp > cblas.tmp2
-	@sed 's/goto[^( ]*/&$(SYMBOLSUFFIX)/g'  cblas.tmp2 > cblas.tmp
-endif
-	@sed 's/common/openblas_config/g' cblas.tmp > "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/cblas.h"
+	@sed 's/common/openblas_config/g' cblas.h > "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/cblas.h"
 endif

-ifneq ($(OSNAME), AIX)
-ifneq ($(NO_LAPACKE), 1)
+ifndef NO_LAPACKE
 	@echo Copying LAPACKE header files to $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
-	@-install -m644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapack.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapack.h"
-	@-install -m644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h"
-	@-install -m644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_config.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h"
-	@-install -m644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_mangling_with_flags.h.in "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h"
-	@-install -m644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_utils.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h"
+	@-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h"
+	@-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_config.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h"
+	@-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_mangling_with_flags.h.in "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h"
+	@-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_utils.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h"
 endif

 #for install static library
-ifneq ($(NO_STATIC),1)
+ifndef NO_STATIC
 	@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
-	@install -m644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
+	@install -pm644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
 	@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
 	ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
 endif
 #for install shared library
-ifneq ($(NO_SHARED),1)
+ifndef NO_SHARED
 	@echo Copying the shared library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
-ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android Haiku FreeBSD DragonFly))
-	@install -m755 $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
+ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android))
+	@install -pm755 $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
 	@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
 	ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \
 	ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
 endif
-
-ifeq ($(OSNAME), $(filter $(OSNAME),OpenBSD NetBSD))
+ifeq ($(OSNAME), FreeBSD)
+	@cp $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
+	@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
+	ln -fs $(LIBSONAME) $(LIBPREFIX).so
+endif
+ifeq ($(OSNAME), NetBSD)
 	@cp $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
 	@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
 	ln -fs $(LIBSONAME) $(LIBPREFIX).so
 endif
 ifeq ($(OSNAME), Darwin)
 	@-cp $(LIBDYNNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
-	@-install_name_tool -id "$(OPENBLAS_LIBRARY_DIR)/$(LIBPREFIX).$(MAJOR_VERSION).dylib" "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)"
+	@-install_name_tool -id "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)" "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)"
 	@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
-	ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib ; \
-	ln -fs $(LIBDYNNAME) $(LIBPREFIX).$(MAJOR_VERSION).dylib
+	ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib
 endif
 ifeq ($(OSNAME), WINNT)
 	@-cp $(LIBDLLNAME) "$(DESTDIR)$(OPENBLAS_BINARY_DIR)"
-	@-cp $(IMPLIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
+	@-cp $(LIBDLLNAME).a "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
 endif
 ifeq ($(OSNAME), CYGWIN_NT)
 	@-cp $(LIBDLLNAME) "$(DESTDIR)$(OPENBLAS_BINARY_DIR)"
-	@-cp $(IMPLIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
 endif
 endif

-else
-#install on AIX has different options syntax
-ifneq ($(NO_LAPACKE), 1)
-	@echo Copying LAPACKE header files to $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
-	@-installbsd -c -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapack.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapack.h"
-	@-installbsd -c -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h"
-	@-installbsd -c -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_config.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h"
-	@-installbsd -c -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_mangling_with_flags.h.in "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h"
-	@-installbsd -c -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_utils.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h"
-endif
-
-#for install static library
-ifneq ($(NO_STATIC),1)
-	@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
-	@installbsd -c -m 644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
-	@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
-	ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
-endif
-#for install shared library
-ifneq ($(NO_SHARED),1)
-	@echo Copying the shared library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
-	@installbsd -c -m 755 $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
-	@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
-	ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \
-	ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
-endif
-
-endif

 #Generating openblas.pc
-ifeq ($(INTERFACE64),1)
-	SUFFIX64=64
-endif
-	PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE)$(SUFFIX64).pc"
-
-	@echo Generating $(LIBSONAMEBASE)$(SUFFIX64).pc in "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)"
-	@echo 'libdir='$(OPENBLAS_LIBRARY_DIR) > "$(PKGFILE)"
-	@echo 'libsuffix='$(SYMBOLSUFFIX) >> "$(PKGFILE)"
-	@echo 'includedir='$(OPENBLAS_INCLUDE_DIR) >> "$(PKGFILE)"
-	@echo 'openblas_config= USE_64BITINT='$(INTERFACE64) 'DYNAMIC_ARCH='$(DYNAMIC_ARCH) 'DYNAMIC_OLDER='$(DYNAMIC_OLDER) 'NO_CBLAS='$(NO_CBLAS) 'NO_LAPACK='$(NO_LAPACK) 'NO_LAPACKE='$(NO_LAPACKE) 'NO_AFFINITY='$(NO_AFFINITY) 'USE_OPENMP='$(USE_OPENMP) $(CORE) 'MAX_THREADS='$(NUM_THREADS)>> "$(PKGFILE)"
-	@echo 'version='$(VERSION) >> "$(PKGFILE)"
-	@echo 'extralib='$(PKG_EXTRALIB) >> "$(PKGFILE)"
-	@cat openblas.pc.in >> "$(PKGFILE)"
+	@echo Generating openblas.pc in $(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)
+	@echo 'libdir='$(OPENBLAS_LIBRARY_DIR) >> $(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/openblas.pc
+	@echo 'includedir='$(OPENBLAS_INCLUDE_DIR) >> $(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/openblas.pc
+	@echo 'version='$(VERSION) >> $(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/openblas.pc
+	@echo 'extralib='$(EXTRALIB) >> $(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/openblas.pc
+	@cat openblas.pc.in >> $(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/openblas.pc


 #Generating OpenBLASConfig.cmake
@@ -175,9 +112,9 @@ endif
 	@echo "SET(OpenBLAS_VERSION \"${VERSION}\")" > "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)"
 	@echo "SET(OpenBLAS_INCLUDE_DIRS ${OPENBLAS_INCLUDE_DIR})" >> "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)"

-ifneq ($(NO_SHARED),1)
+ifndef NO_SHARED
 #ifeq logical or
-ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD NetBSD OpenBSD DragonFly))
+ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD NetBSD))
 	@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_LIBRARY_DIR}/$(LIBPREFIX).so)" >> "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)"
 endif
 ifeq ($(OSNAME), $(filter $(OSNAME),WINNT CYGWIN_NT))
@@ -202,3 +139,4 @@ endif
 	@echo "  endif ()" >> "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG_VERSION)"
 	@echo "endif ()" >> "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG_VERSION)"
 	@echo Install OK!
+
--- a/Makefile.loongarch64
+++ b/Makefile.loongarch64
@@ -1,3 +0,0 @@
-ifdef BINARY64
-else
-endif
--- a/Makefile.mips
+++ b/Makefile.mips
@@ -1,4 +1,3 @@
-MSA_FLAGS = -mmsa -mfp64 -mload-store-pairs
 ifdef BINARY64
 else
 endif
--- a/Makefile.mips64
+++ b/Makefile.mips64
@@ -1,4 +1,3 @@
-MSA_FLAGS = -mmsa -mfp64 -mload-store-pairs
 ifdef BINARY64
 else
 endif
--- a/Makefile.power
+++ b/Makefile.power
@@ -9,92 +9,18 @@ else
 USE_OPENMP = 1
 endif

-ifeq ($(CORE), POWER10)
-ifneq ($(C_COMPILER), PGI)
-CCOMMON_OPT += -Ofast -mcpu=power10 -mtune=power10 -mvsx -fno-fast-math
-ifeq ($(F_COMPILER), IBM)
-FCOMMON_OPT += -O2 -qrecur -qnosave
-else
-FCOMMON_OPT += -O2 -frecursive -mcpu=power10 -mtune=power10  -fno-fast-math
-endif
-endif
-endif

-ifeq ($(CORE), POWER9)
-ifneq ($(C_COMPILER), PGI)
-CCOMMON_OPT += -Ofast -mvsx -fno-fast-math
-ifeq ($(C_COMPILER), GCC)
-ifneq ($(GCCVERSIONGT4), 1)
-$(warning your compiler is too old to fully support POWER9, getting a newer version of gcc is recommended)
-CCOMMON_OPT += -mcpu=power8 -mtune=power8 
-else
-CCOMMON_OPT += -mcpu=power9 -mtune=power9 
-endif
-else
-CCOMMON_OPT += -mcpu=power9 -mtune=power9
-endif
-else
-CCOMMON_OPT += -fast -Mvect=simd -Mcache_align
-endif
-ifneq ($(F_COMPILER), PGI)
-ifeq ($(F_COMPILER), IBM)
-FCOMMON_OPT += -O2 -qrecur -qnosave
-else
-FCOMMON_OPT += -O2 -frecursive -fno-fast-math
-endif
-ifeq ($(C_COMPILER), GCC)
-ifneq ($(GCCVERSIONGT4), 1)
-$(warning your compiler is too old to fully support POWER9, getting a newer version of gcc is recommended)
-FCOMMON_OPT += -mcpu=power8 -mtune=power8 
-else
-FCOMMON_OPT += -mcpu=power9 -mtune=power9 
-endif
-else
-FCOMMON_OPT += -mcpu=power9 -mtune=power9
-endif
-else
-FCOMMON_OPT += -O2 -Mrecursive
-endif
-endif

 ifeq ($(CORE), POWER8)
-ifneq ($(C_COMPILER), PGI)
-CCOMMON_OPT += -Ofast -mcpu=power8 -mtune=power8 -mvsx  -fno-fast-math
-else
-CCOMMON_OPT += -fast -Mvect=simd -Mcache_align
-endif
-ifneq ($(F_COMPILER), PGI)
-ifeq ($(OSNAME), AIX)
-ifeq ($(F_COMPILER), IBM)
-FCOMMON_OPT += -O2 -qrecur -qnosave
-else
-FCOMMON_OPT += -O1 -frecursive -mcpu=power8 -mtune=power8  -fno-fast-math 
-endif
-else
-FCOMMON_OPT += -O2 -frecursive -mcpu=power8 -mtune=power8  -fno-fast-math 
-endif
-else
-FCOMMON_OPT += -O2 -Mrecursive
-endif
-endif
-
 ifeq ($(USE_OPENMP), 1)
-ifneq ($(C_COMPILER), PGI)
-CCOMMON_OPT += -DUSE_OPENMP -fopenmp
+COMMON_OPT += -Ofast -mcpu=power8 -mtune=power8 -mvsx -malign-power -DUSE_OPENMP -fno-fast-math -fopenmp
+FCOMMON_OPT += -O2 -frecursive -mcpu=power8 -mtune=power8 -malign-power -DUSE_OPENMP -fno-fast-math -fopenmp
 else
-CCOMMON_OPT += -DUSE_OPENMP -mp
-endif
-ifneq ($(F_COMPILER), PGI)
-FCOMMON_OPT += -DUSE_OPENMP -fopenmp
-else
-FCOMMON_OPT += -DUSE_OPENMP -mp
+COMMON_OPT += -Ofast -mcpu=power8 -mtune=power8 -mvsx -malign-power -fno-fast-math
+FCOMMON_OPT += -O2 -frecursive -mcpu=power8 -mtune=power8 -malign-power -fno-fast-math
 endif
 endif

-# workaround for C->FORTRAN ABI violation in LAPACKE
-ifeq ($(F_COMPILER), GFORTRAN)
-FCOMMON_OPT += -fno-optimize-sibling-calls
-endif

 FLAMEPATH	= $(HOME)/flame/lib

@@ -130,9 +56,6 @@ CCOMMON_OPT	+= -mpowerpc64 -maix64
 ifeq ($(COMPILER_F77), g77)
 FCOMMON_OPT	+= -mpowerpc64 -maix64
 endif
-ifeq ($(F_COMPILER), GFORTRAN)
-FCOMMON_OPT	+= -mpowerpc64 -maix64
-endif
 ifeq ($(COMPILER_F77), xlf)
 FCOMMON_OPT	+= -q64
 endif
--- a/Makefile.prebuild
+++ b/Makefile.prebuild
@@ -3,10 +3,6 @@
 export BINARY
 export USE_OPENMP

-ifdef DYNAMIC_ARCH
-override HOST_CFLAGS += -DDYNAMIC_ARCH
-endif
-
 ifdef TARGET_CORE
 TARGET_MAKE = Makefile_kernel.conf
 TARGET_CONF = config_kernel.h
@@ -15,26 +11,12 @@ TARGET_MAKE = Makefile.conf
 TARGET_CONF = config.h
 endif

-ifdef USE_PERL
-SCRIPTSUFFIX = .pl
-else
-SCRIPTSUFFIX =
-endif
-
 # CPUIDEMU = ../../cpuid/table.o

 ifdef CPUIDEMU
 EXFLAGS = -DCPUIDEMU -DVENDOR=99
 endif

-ifeq ($(TARGET), MIPS24K)
-TARGET_FLAGS = -mips32r2
-endif
-
-ifeq ($(TARGET), MIPS1004K)
-TARGET_FLAGS = -mips32r2
-endif
-
 ifeq ($(TARGET), P5600)
 TARGET_FLAGS = -mips32r5
 endif
@@ -47,22 +29,14 @@ ifeq ($(TARGET), P6600)
 TARGET_FLAGS = -mips64r6
 endif

-ifeq ($(TARGET), I6500)
-TARGET_FLAGS = -mips64r6
-endif
-
-ifeq ($(TARGET), C910V)
-TARGET_FLAGS = -march=rv64gcv0p7_zfh_xtheadc -mabi=lp64d
-endif
-
 all: getarch_2nd
 	./getarch_2nd  0 >> $(TARGET_MAKE)
 	./getarch_2nd  1 >> $(TARGET_CONF)

-$(TARGET_CONF): c_check$(SCRIPTSUFFIX) f_check$(SCRIPTSUFFIX) getarch
-	./c_check$(SCRIPTSUFFIX) $(TARGET_MAKE) $(TARGET_CONF) "$(CC)" $(TARGET_FLAGS) $(CFLAGS)
+config.h : c_check f_check getarch
+	perl ./c_check $(TARGET_MAKE) $(TARGET_CONF) $(CC) $(TARGET_FLAGS)
 ifneq ($(ONLY_CBLAS), 1)
-	./f_check$(SCRIPTSUFFIX) $(TARGET_MAKE) $(TARGET_CONF) "$(FC)" $(TARGET_FLAGS)
+	perl ./f_check $(TARGET_MAKE) $(TARGET_CONF) $(FC) $(TARGET_FLAGS)
 else
 #When we only build CBLAS, we set NOFORTRAN=2
 	echo "NOFORTRAN=2" >> $(TARGET_MAKE)
@@ -77,17 +51,13 @@ endif


 getarch : getarch.c cpuid.S dummy $(CPUIDEMU)
-	avx512=$$(./c_check$(SCRIPTSUFFIX) - - "$(CC)" $(TARGET_FLAGS) $(CFLAGS) | grep NO_AVX512); \
-	rv64gv=$$(./c_check$(SCRIPTSUFFIX) - - "$(CC)" $(TARGET_FLAGS) $(CFLAGS) | grep NO_RV64GV); \
-	$(HOSTCC) $(HOST_CFLAGS) $(EXFLAGS) $${avx512:+-D$${avx512}} $${rv64gv:+-D$${rv64gv}} -o $(@F) getarch.c cpuid.S $(CPUIDEMU)
+	$(HOSTCC) $(CFLAGS) $(EXFLAGS) -o $(@F) getarch.c cpuid.S $(CPUIDEMU)

-getarch_2nd : getarch_2nd.c $(TARGET_CONF) dummy
+getarch_2nd : getarch_2nd.c config.h dummy
 ifndef TARGET_CORE
-	$(HOSTCC) -I. $(HOST_CFLAGS) -o $(@F) getarch_2nd.c
+	$(HOSTCC) -I. $(CFLAGS) -o $(@F) getarch_2nd.c
 else
-	$(HOSTCC) -I. $(HOST_CFLAGS) -DBUILD_KERNEL -o $(@F) getarch_2nd.c
+	$(HOSTCC) -I. $(CFLAGS) -DBUILD_KERNEL -o $(@F) getarch_2nd.c
 endif

 dummy:
-
-.PHONY: dummy
--- a/Makefile.riscv64
+++ b/Makefile.riscv64
@@ -1,4 +0,0 @@
-ifeq ($(CORE), C910V)
-CCOMMON_OPT += -march=rv64imafdcv0p7_zfh_xtheadc -mabi=lp64d -mtune=c920 -O1
-FCOMMON_OPT += -march=rv64imafdcv0p7_zfh_xtheadc -mabi=lp64d -mtune=c920 -static
-endif
--- a/Makefile.rule
+++ b/Makefile.rule
@@ -3,7 +3,7 @@
 #

 # This library's version
-VERSION = 0.3.23.dev
+VERSION = 0.2.20

 # If you set the suffix, the library name will be libopenblas_$(LIBNAMESUFFIX).a
 # and libopenblas_$(LIBNAMESUFFIX).so. Meanwhile, the soname in shared library
@@ -17,11 +17,6 @@ VERSION = 0.3.23.dev
 # If you want to support multiple architecture in one binary
 # DYNAMIC_ARCH = 1

-# If you want the full list of x86_64 architectures supported in DYNAMIC_ARCH
-# mode (including individual optimizied codes for PENRYN, DUNNINGTON, OPTERON,
-# OPTERON_SSE3, ATOM and NANO rather than fallbacks to older architectures)
-# DYNAMIC_OLDER = 1
-
 # C compiler including binary type(32bit / 64bit). Default is gcc.
 # Don't use Intel Compiler or PGI, it won't generate right codes as I expect.
 # CC = gcc
@@ -48,8 +43,6 @@ VERSION = 0.3.23.dev
 # HOSTCC = gcc

 # If you need 32bit binary, define BINARY=32, otherwise define BINARY=64
-# Please note that AVX is not available on 32-bit.
-# Setting BINARY=32 disables AVX/AVX2/AVX-512.
 # BINARY=64

 # About threaded BLAS. It will be automatically detected if you don't
@@ -58,72 +51,33 @@ VERSION = 0.3.23.dev
 # For force setting for multi  threaded, specify USE_THREAD = 1
 # USE_THREAD = 0

-# If you want to build a single-threaded OpenBLAS, but expect to call this
-# from several concurrent threads in some other program, comment this in for
-# thread safety. (This is done automatically for USE_THREAD=1 , and should not
-# be necessary when USE_OPENMP=1)
-# USE_LOCKING = 1
-
 # If you're going to use this library with OpenMP, please comment it in.
-# This flag is always set for POWER8. Don't set USE_OPENMP = 0 if you're targeting POWER8.
+# This flag is always set for POWER8. Don't modify the flag 
 # USE_OPENMP = 1

-# The OpenMP scheduler to use - by default this is "static" and you
-# will normally not want to change this unless you know that your main
-# workload will involve tasks that have highly unbalanced running times
-# for individual threads. Changing away from "static" may also adversely
-# affect memory access locality in NUMA systems. Setting to "runtime" will
-# allow you to select the scheduler from the environment variable OMP_SCHEDULE
-# CCOMMON_OPT += -DOMP_SCHED=dynamic
-
-# You can define the maximum number of threads. Basically it should be less
-# than or equal to the number of CPU threads. If you don't specify one, it's
-# automatically detected by the build system.
-# If SMT (aka. HT) is enabled on the system, it may or may not be beneficial to 
-# restrict NUM_THREADS to the number of physical cores. By default, the automatic 
-# detection includes logical CPUs, thus allowing the use of SMT.
-# Users may opt at runtime to use less than NUM_THREADS threads.
-#
-# Note for package maintainers: you can build OpenBLAS with a large NUM_THREADS
-# value (eg. 32-256) if you expect your users to use that many threads. Due to the way
-# some internal structures are allocated, using a large NUM_THREADS value has a RAM
-# footprint penalty, even if users reduce the actual number of threads at runtime.
+# You can define maximum number of threads. Basically it should be
+# less than actual number of cores. If you don't specify one, it's
+# automatically detected by the the script.
 # NUM_THREADS = 24

-# If you have enabled USE_OPENMP and your application would call
-# OpenBLAS's calculation API from multiple threads, please comment this in.
-# This flag defines how many instances of OpenBLAS's calculation API can actually
-# run in parallel. If more than NUM_PARALLEL threads call OpenBLAS's calculation API,
-# they need to wait for the preceding API calls to finish or risk data corruption.
-# NUM_PARALLEL = 2
-
-# When multithreading, OpenBLAS needs to use a memory buffer for communicating
-# and collating results for individual subranges of the original matrix. Since
-# the original GotoBLAS of the early 2000s, the default size of this buffer has
-# been set at a value of 32<<20 (which is 32MB) on x86_64 , twice that on PPC.
-# If you expect to handle large problem sizes (beyond about 30000x30000) uncomment
-# this line and adjust the (32<<n) factor if necessary. Usually an insufficient value
-# manifests itself as a crash in the relevant scal kernel (sscal_k, dscal_k etc) 
-# BUFFERSIZE = 25
-
-# If you don't need to install the static library, please comment this in.
+# if you don't need to install the static library, please comment it in.
 # NO_STATIC = 1

-# If you don't need to generate the shared library, please comment this in.
+# if you don't need generate the shared library, please comment it in.
 # NO_SHARED = 1

-# If you don't need the CBLAS interface, please comment this in.
+# If you don't need CBLAS interface, please comment it in.
 # NO_CBLAS = 1

-# If you only want the CBLAS interface without installing a Fortran compiler,
-# please comment this in.
+# If you only want CBLAS interface without installing Fortran compiler,
+# please comment it in.
 # ONLY_CBLAS = 1

-# If you don't need LAPACK, please comment this in.
-# If you set NO_LAPACK=1, the build system automatically sets NO_LAPACKE=1.
+# If you don't need LAPACK, please comment it in.
+# If you set NO_LAPACK=1, the library automatically sets NO_LAPACKE=1.
 # NO_LAPACK = 1

-# If you don't need LAPACKE (C Interface to LAPACK), please comment this in.
+# If you don't need LAPACKE (C Interface to LAPACK), please comment it in.
 # NO_LAPACKE = 1

 # Build LAPACK Deprecated functions since LAPACK 3.6.0
@@ -131,22 +85,13 @@ BUILD_LAPACK_DEPRECATED = 1

 # Build RecursiveLAPACK on top of LAPACK
 # BUILD_RELAPACK = 1
-# Have RecursiveLAPACK actually replace standard LAPACK routines instead of 
-# just adding its equivalents with a RELAPACK_ prefix
-# RELAPACK_REPLACE = 1

-# If you want to use the legacy threaded Level 3 implementation.
+# If you want to use legacy threaded Level 3 implementation.
 # USE_SIMPLE_THREADED_LEVEL3 = 1

-# If you want to use the new, still somewhat experimental code that uses
-# thread-local storage instead of a central memory buffer in memory.c
-# Note that if your system uses GLIBC, it needs to have at least glibc 2.21
-# for this to work.
-# USE_TLS = 1
-
 # If you want to drive whole 64bit region by BLAS. Not all Fortran
-# compilers support this. It's safe to keep this commented out if you
-# are not sure. (This is equivalent to the "-i8" ifort option).
+# compiler supports this. It's safe to keep comment it out if you
+# are not sure(equivalent to "-i8" option).
 # INTERFACE64 = 1

 # Unfortunately most of kernel won't give us high quality buffer.
@@ -154,18 +99,10 @@ BUILD_LAPACK_DEPRECATED = 1
 # but it will consume time. If you don't like it, you can disable one.
 NO_WARMUP = 1

-# Comment this in if you want to disable OpenBLAS's CPU/Memory affinity handling.
-# This feature is only implemented on Linux, and is always disabled on other platforms.
-# Enabling affinity handling may improve performance, especially on NUMA systems, but 
-# it may conflict with certain applications that also try to manage affinity.
-# This conflict can result in threads of the application calling OpenBLAS ending up locked
-# to the same core(s) as OpenBLAS, possibly binding all threads to a single core.
-# For this reason, affinity handling is disabled by default. Can be safely enabled if nothing
-# else modifies affinity settings.
-# Note: enabling affinity has been known to cause problems with NumPy and R
-NO_AFFINITY = 1
+# If you want to disable CPU/Memory affinity on Linux.
+#NO_AFFINITY = 1

-# If you are compiling for Linux and you have more than 16 numa nodes or more than 256 cpus
+# if you are compiling for Linux and you have more than 16 numa nodes or more than 256 cpus
 # BIGNUMA = 1

 # Don't use AVX kernel on Sandy Bridge. It is compatible with old compilers
@@ -175,10 +112,6 @@ NO_AFFINITY = 1
 # Don't use Haswell optimizations if binutils is too old (e.g. RHEL6)
 # NO_AVX2 = 1

-# Don't use SkylakeX optimizations if binutils or compiler are too old (the build
-# system will try to determine this automatically)
-# NO_AVX512 = 1
-
 # Don't use parallel make.
 # NO_PARALLEL_MAKE = 1

@@ -193,9 +126,6 @@ NO_AFFINITY = 1
 # FUNCTION_PROFILE = 1

 # Support for IEEE quad precision(it's *real* REAL*16)( under testing)
-# This option should not be used - it is a holdover from unfinished code present
-# in the original GotoBLAS2 library that may be usable as a starting point but
-# is not even expected to compile in its present form.
 # QUAD_PRECISION = 1

 # Theads are still working for a while after finishing BLAS operation
@@ -203,25 +133,22 @@ NO_AFFINITY = 1
 # time out to improve performance. This number should be from 4 to 30
 # which corresponds to (1 << n) cycles. For example, if you set to 26,
 # thread will be running for (1 << 26) cycles(about 25ms on 3.0GHz
-# system). Also you can control this number by THREAD_TIMEOUT
+# system). Also you can control this mumber by THREAD_TIMEOUT
 # CCOMMON_OPT	+= -DTHREAD_TIMEOUT=26

-# Using special device driver for mapping physically contiguous memory
+# Using special device driver for mapping physically contigous memory
 # to the user space. If bigphysarea is enabled, it will use it.
 # DEVICEDRIVER_ALLOCATION = 1

-# If you need to synchronize FP CSR between threads (for x86/x86_64 and aarch64 only).
+# If you need to synchronize FP CSR between threads (for x86/x86_64 only).
 # CONSISTENT_FPCSR = 1

-# If any gemm argument m, n or k is less or equal this threshold, gemm will be execute
-# with single thread. (Actually in recent versions this is a factor proportional to the
-# number of floating point operations necessary for the given problem size, no longer
-# an individual dimension). You can use this setting to avoid the overhead of multi-
-# threading in small matrix sizes. The default value is 4, but values as high as 50 have 
-# been reported to be optimal for certain workloads (50 is the recommended value for Julia).
+# If any gemm arguement m, n or k is less or equal this threshold, gemm will be execute
+# with single thread. You can use this flag to avoid the overhead of multi-threading
+# in small matrix sizes. The default value is 4.
 # GEMM_MULTITHREAD_THRESHOLD = 4

-# If you need sanity check by comparing results to reference BLAS. It'll be very
+# If you need santy check by comparing reference BLAS. It'll be very
 # slow (Not implemented yet).
 # SANITY_CHECK = 1

@@ -233,8 +160,8 @@ NO_AFFINITY = 1
 # Flags for POWER8 are defined in Makefile.power. Don't modify COMMON_OPT
 # COMMON_OPT = -O2

-# gfortran option for LAPACK to improve thread-safety
-# It is enabled by default in Makefile.system for gfortran
+# gfortran option for LAPACK
+# enable this flag only on 64bit Linux and if you need a thread safe lapack library
 # Flags for POWER8 are defined in Makefile.power. Don't modify FCOMMON_OPT
 # FCOMMON_OPT = -frecursive

@@ -261,50 +188,6 @@ COMMON_PROF = -pg
 # SYMBOLPREFIX=
 # SYMBOLSUFFIX=

-# Run a C++ based thread safety tester after the build is done.
-# This is mostly intended as a developer feature to spot regressions, but users and
-# package maintainers can enable this if they have doubts about the thread safety of
-# the library, given the configuration in this file.
-# By default, the thread safety tester launches 52 concurrent calculations at the same
-# time.
-#
-# Please note that the test uses ~1300 MiB of RAM for the DGEMM test.
-#
-# The test requires CBLAS to be built, a C++11 capable compiler and the presence of
-# an OpenMP implementation. If you are cross-compiling this test will probably not
-# work at all.
-#
-# CPP_THREAD_SAFETY_TEST = 1
-#
-# use this to run only the less memory-hungry GEMV test
-# CPP_THREAD_SAFETY_GEMV = 1
-
-
-# If you want to enable the experimental BFLOAT16 support
-# BUILD_BFLOAT16 = 1
-
-
-# Set the thread number threshold beyond which the job array for the threaded level3 BLAS
-# will be allocated on the heap rather than the stack. (This array alone requires 
-# NUM_THREADS*NUM_THREADS*128 bytes of memory so should not pose a problem at low cpu
-# counts, but obviously it is not the only item that ends up on the stack.
-# The default value of 32 ensures that the overall requirement is compatible
-# with the default 1MB stacksize imposed by having the Java VM loaded without use
-# of its -Xss parameter.
-# The value of 160 formerly used from about version 0.2.7 until 0.3.10 is easily compatible
-# with the common Linux stacksize of 8MB but will cause crashes with unwary use of the java
-# VM e.g. in Octave or with the java-based libhdfs in numpy or scipy code
-# BLAS3_MEM_ALLOC_THRESHOLD = 160
-
-
-
-# By default the library contains BLAS functions (and LAPACK if selected) for all input types.
-# To build a smaller library supporting e.g. only single precision real (SGEMM etc.) or only
-# the functions for complex numbers, uncomment the desired type(s) below
-# BUILD_SINGLE = 1
-# BUILD_DOUBLE = 1
-# BUILD_COMPLEX = 1
-# BUILD_COMPLEX16 = 1
 #
 #  End of user configuration
 #
--- a/Makefile.sparc
+++ b/Makefile.sparc
@@ -3,29 +3,21 @@ RANLIB  = ranlib

 ifdef BINARY64

-ifeq ($(C_COMPILER), GCC)
 CCOMMON_OPT += -mcpu=v9 -m64
-else
-CCOMMON_OPT +=  -m64
-endif
 ifeq ($(COMPILER_F77), g77)
 FCOMMON_OPT += -mcpu=v9 -m64
 endif
-ifeq ($(COMPILER_F77), f95)
-FCOMMON_OPT += -m64
+ifeq ($(COMPILER_F77), f90)
+FCOMMON_OPT += -xarch=v9
 endif
 else

-ifeq ($(C_COMPILER), GCC)
 CCOMMON_OPT += -mcpu=v9
-else
-CCOMMON_OPT +=  -xarch=v9
-endif

 ifeq ($(COMPILER_F77), g77)
 FCOMMON_OPT += -mcpu=v9
 endif
-ifeq ($(COMPILER_F77), f95)
+ifeq ($(COMPILER_F77), f90)
 FCOMMON_OPT += -xarch=v8plusb
 endif

@@ -45,4 +37,4 @@ LIBSUNPERF	= -L/opt/SUNWspro/lib/v9 -L/opt/SUNWspro/prod/lib/v9 \
 else
 LIBSUNPERF	= -L/opt/SUNWspro/lib -L/opt/SUNWspro/prod/lib \
 		-Wl,-R,/opt/SUNWspro/lib -lsunperf -lompstubs -lfui -lfsu -lsunmath
-endif
+endif
--- a/Makefile.system
+++ b/Makefile.system
--- a/Makefile.tail
+++ b/Makefile.tail
@@ -1,18 +1,16 @@
-SBBLASOBJS_P = $(SBBLASOBJS:.$(SUFFIX)=.$(PSUFFIX))
 SBLASOBJS_P = $(SBLASOBJS:.$(SUFFIX)=.$(PSUFFIX))
 DBLASOBJS_P = $(DBLASOBJS:.$(SUFFIX)=.$(PSUFFIX))
 QBLASOBJS_P = $(QBLASOBJS:.$(SUFFIX)=.$(PSUFFIX))
 CBLASOBJS_P = $(CBLASOBJS:.$(SUFFIX)=.$(PSUFFIX))
 ZBLASOBJS_P = $(ZBLASOBJS:.$(SUFFIX)=.$(PSUFFIX))
 XBLASOBJS_P = $(XBLASOBJS:.$(SUFFIX)=.$(PSUFFIX))
-SBEXTOBJS_P = $(SBEXTOBJS:.$(SUFFIX)=.$(PSUFFIX))

 COMMONOBJS_P = $(COMMONOBJS:.$(SUFFIX)=.$(PSUFFIX))

 HPLOBJS_P   = $(HPLOBJS:.$(SUFFIX)=.$(PSUFFIX))

-BLASOBJS    = $(SBEXTOBJS) $(SBBLASOBJS)  $(SBLASOBJS)   $(DBLASOBJS)   $(CBLASOBJS)   $(ZBLASOBJS) $(CBAUXOBJS)
-BLASOBJS_P  = $(SBEXTOBJS_P) $(SBBLASOBJS_P) $(SBLASOBJS_P) $(DBLASOBJS_P) $(CBLASOBJS_P) $(ZBLASOBJS_P) $(CBAUXOBJS_P)
+BLASOBJS    = $(SBLASOBJS)   $(DBLASOBJS)   $(CBLASOBJS)   $(ZBLASOBJS)
+BLASOBJS_P  = $(SBLASOBJS_P) $(DBLASOBJS_P) $(CBLASOBJS_P) $(ZBLASOBJS_P)

 ifdef EXPRECISION
 BLASOBJS   += $(QBLASOBJS)   $(XBLASOBJS)
@@ -24,23 +22,19 @@ BLASOBJS   += $(QBLASOBJS)   $(XBLASOBJS)
 BLASOBJS_P += $(QBLASOBJS_P) $(XBLASOBJS_P)
 endif

-$(SBBLASOBJS) $(SBBLASOBJS_P) : override CFLAGS += -DBFLOAT16 -UDOUBLE  -UCOMPLEX
 $(SBLASOBJS) $(SBLASOBJS_P) : override CFLAGS += -UDOUBLE  -UCOMPLEX
 $(DBLASOBJS) $(DBLASOBJS_P) : override CFLAGS += -DDOUBLE  -UCOMPLEX
 $(QBLASOBJS) $(QBLASOBJS_P) : override CFLAGS += -DXDOUBLE -UCOMPLEX
 $(CBLASOBJS) $(CBLASOBJS_P) : override CFLAGS += -UDOUBLE  -DCOMPLEX
 $(ZBLASOBJS) $(ZBLASOBJS_P) : override CFLAGS += -DDOUBLE  -DCOMPLEX
 $(XBLASOBJS) $(XBLASOBJS_P) : override CFLAGS += -DXDOUBLE -DCOMPLEX
-$(SBEXTOBJS) $(SBEXTOBJS_P) : override CFLAGS += -DBFLOAT16 -UDOUBLE  -UCOMPLEX

-$(SBBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
 $(SBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
 $(DBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
 $(QBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
 $(CBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
 $(ZBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
 $(XBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
-$(SBEXTOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)

 libs    :: $(BLASOBJS) $(COMMONOBJS)
 	$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^
--- a/Makefile.x86
+++ b/Makefile.x86
@@ -1,21 +1,5 @@
 # COMPILER_PREFIX = mingw32-

-ifneq ($(DYNAMIC_ARCH),1)
-ADD_CPUFLAGS = 1
-else
-ifdef TARGET_CORE
-ADD_CPUFLAGS = 1
-endif
-endif
-
-ifdef ADD_CPUFLAGS
-ifdef HAVE_SSE
-CCOMMON_OPT += -msse
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -msse
-endif
-endif
-endif

 ifeq ($(OSNAME), Interix)
 ARFLAGS		= -m x86
@@ -70,20 +54,3 @@ LIBATLAS	= -L$(ATLASPATH)/32 -lcblas -lf77blas -latlas -lm
 else
 LIBATLAS	= -L$(ATLASPATH)/32 -lptf77blas -lptatlas -lpthread -lm
 endif
-ifdef HAVE_SSE2
-CCOMMON_OPT += -msse2
-FCOMMON_OPT += -msse2
-endif
-ifdef HAVE_SSE3
-CCOMMON_OPT += -msse3
-FCOMMON_OPT += -msse3
-ifdef HAVE_SSSE3
-CCOMMON_OPT += -mssse3
-FCOMMON_OPT += -mssse3
-endif
-ifdef HAVE_SSE4_1
-CCOMMON_OPT += -msse4.1
-FCOMMON_OPT += -msse4.1
-endif
-endif
-
--- a/Makefile.x86_64
+++ b/Makefile.x86_64
@@ -8,185 +8,6 @@ endif
 endif
 endif

-
-ifneq ($(DYNAMIC_ARCH),1)
-ADD_CPUFLAGS = 1
-else
-ifdef TARGET_CORE
-ADD_CPUFLAGS = 1
-endif
-endif
-
-ifdef ADD_CPUFLAGS
-ifdef HAVE_SSE3
-CCOMMON_OPT += -msse3
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -msse3
-endif
-endif
-ifdef HAVE_SSSE3
-CCOMMON_OPT += -mssse3
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -mssse3
-endif
-endif
-ifdef HAVE_SSE4_1
-CCOMMON_OPT += -msse4.1
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -msse4.1
-endif
-endif
-ifndef OLDGCC
-ifdef HAVE_AVX
-CCOMMON_OPT += -mavx
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -mavx
-endif
-endif
-endif
-ifndef NO_AVX2
-ifdef HAVE_AVX2
-CCOMMON_OPT += -mavx2
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -mavx2
-endif
-endif
-endif
-
-ifeq ($(CORE), SKYLAKEX)
-ifndef NO_AVX512
-CCOMMON_OPT += -march=skylake-avx512
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=skylake-avx512
-endif
-ifeq ($(OSNAME), CYGWIN_NT)
-CCOMMON_OPT += -fno-asynchronous-unwind-tables
-FCOMMON_OPT += -fno-asynchronous-unwind-tables
-endif
-ifeq ($(OSNAME), WINNT)
-ifeq ($(C_COMPILER), GCC)
-CCOMMON_OPT += -fno-asynchronous-unwind-tables
-FCOMMON_OPT += -fno-asynchronous-unwind-tables
-endif
-endif
-endif
-endif
-
-ifeq ($(CORE), COOPERLAKE)
-ifndef NO_AVX512
-ifeq ($(C_COMPILER), GCC)
-# cooperlake support was added in 10.1
-ifeq ($(GCCVERSIONGTEQ10)$(GCCMINORVERSIONGTEQ1), 11)
-CCOMMON_OPT += -march=cooperlake
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=cooperlake
-endif
-else  # gcc not support, fallback to avx512
-CCOMMON_OPT += -march=skylake-avx512
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=skylake-avx512
-endif
-endif
-endif
-ifeq ($(OSNAME), CYGWIN_NT)
-CCOMMON_OPT += -fno-asynchronous-unwind-tables
-FCOMMON_OPT += -fno-asynchronous-unwind-tables
-endif
-ifeq ($(OSNAME), WINNT)
-ifeq ($(C_COMPILER), GCC)
-CCOMMON_OPT += -fno-asynchronous-unwind-tables
-FCOMMON_OPT += -fno-asynchronous-unwind-tables
-endif
-endif
-endif
-endif
-
-ifeq ($(CORE), SAPPHIRERAPIDS)
-ifndef NO_AVX512
-ifeq ($(C_COMPILER), GCC)
-# sapphire rapids support was added in 11
-ifeq ($(GCCVERSIONGTEQ11), 1)
-CCOMMON_OPT += -march=sapphirerapids
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=sapphirerapids
-endif
-else  # gcc not support, fallback to avx512
-CCOMMON_OPT += -march=skylake-avx512
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=skylake-avx512
-endif
-endif
-endif
-ifeq ($(OSNAME), CYGWIN_NT)
-CCOMMON_OPT += -fno-asynchronous-unwind-tables
-FCOMMON_OPT += -fno-asynchronous-unwind-tables
-endif
-ifeq ($(OSNAME), WINNT)
-ifeq ($(C_COMPILER), GCC)
-CCOMMON_OPT += -fno-asynchronous-unwind-tables
-FCOMMON_OPT += -fno-asynchronous-unwind-tables
-endif
-endif
-endif
-endif
-
-ifeq ($(CORE), ZEN)
-ifdef HAVE_AVX512VL	
-ifndef NO_AVX512
-CCOMMON_OPT += -march=skylake-avx512
-ifneq ($(F_COMPILER), NAG)
-FCOMMON_OPT += -march=skylake-avx512
-endif
-ifeq ($(OSNAME), CYGWIN_NT)
-CCOMMON_OPT += -fno-asynchronous-unwind-tables
-FCOMMON_OPT += -fno-asynchronous-unwind-tables
-endif
-ifeq ($(OSNAME), WINNT)
-ifeq ($(C_COMPILER), GCC)
-CCOMMON_OPT += -fno-asynchronous-unwind-tables
-FCOMMON_OPT += -fno-asynchronous-unwind-tables
-endif
-endif
-endif
-endif
-endif
-
-
-ifdef HAVE_AVX2
-ifndef NO_AVX2
-ifeq ($(C_COMPILER), GCC)
-# AVX2 support was added in 4.7.0
-GCCVERSIONCHECK := $(GCCVERSIONGT4)$(GCCVERSIONGTEQ4)$(GCCMINORVERSIONGTEQ7)
-ifeq ($(GCCVERSIONCHECK), $(filter $(GCCVERSIONCHECK), 011 110 111))
-CCOMMON_OPT += -mavx2
-endif
-else 
-ifeq ($(C_COMPILER), CLANG)
-CCOMMON_OPT += -mavx2
-endif
-endif
-ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
-ifeq ($(F_COMPILER), GFORTRAN)
-# AVX2 support was added in 4.7.0
-GCCVERSIONGTEQ4 := $(shell expr `$(FC) -dumpversion | cut -f1 -d.` \>= 4)
-GCCVERSIONGTEQ5 := $(shell expr `$(FC) -dumpversion | cut -f1 -d.` \>= 5)
-GCCMINORVERSIONGTEQ7 := $(shell expr `$(FC) -dumpversion | cut -f2 -d.` \>= 7)
-GCCVERSIONCHECK := $(GCCVERSIONGTEQ5)$(GCCVERSIONGTEQ4)$(GCCMINORVERSIONGTEQ7)
-ifeq ($(GCCVERSIONCHECK), $(filter $(GCCVERSIONCHECK), 011 110 111))
-FCOMMON_OPT += -mavx2
-endif
-else
-ifeq ($(F_COMPILER), FLANG)
-FCOMMON_OPT += -mavx2
-endif
-endif
-endif
-endif
-endif
-
-endif
-
-
 ifeq ($(OSNAME), Interix)
 ARFLAGS		= -m x64
 endif
--- a/Makefile.zarch
+++ b/Makefile.zarch
@@ -4,13 +4,3 @@ CCOMMON_OPT += -march=z13 -mzvector
 FCOMMON_OPT += -march=z13 -mzvector
 endif

-ifeq ($(CORE), Z14)
-CCOMMON_OPT += -march=z14 -mzvector -O3
-FCOMMON_OPT += -march=z14 -mzvector
-endif
-
-# Enable floating-point expression contraction for clang, since it is the
-# default for gcc
-ifeq ($(C_COMPILER), CLANG)
-CCOMMON_OPT += -ffp-contract=on
-endif
--- a/README.md
+++ b/README.md
@@ -2,295 +2,175 @@

 [![Join the chat at https://gitter.im/xianyi/OpenBLAS](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/xianyi/OpenBLAS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

-Travis CI: [![Build Status](https://travis-ci.com/xianyi/OpenBLAS.svg?branch=develop)](https://travis-ci.com/xianyi/OpenBLAS)
+Travis CI: [![Build Status](https://travis-ci.org/xianyi/OpenBLAS.png?branch=develop)](https://travis-ci.org/xianyi/OpenBLAS)

 AppVeyor: [![Build status](https://ci.appveyor.com/api/projects/status/09sohd35n8nkkx64/branch/develop?svg=true)](https://ci.appveyor.com/project/xianyi/openblas/branch/develop)
-
-Cirrus CI: [![Build Status](https://api.cirrus-ci.com/github/xianyi/OpenBLAS.svg?branch=develop)](https://cirrus-ci.com/github/xianyi/OpenBLAS)
-<!-- Drone CI: [![Build Status](https://cloud.drone.io/api/badges/xianyi/OpenBLAS/status.svg?branch=develop)](https://cloud.drone.io/xianyi/OpenBLAS/)-->
-
-[![Build Status](https://dev.azure.com/xianyi/OpenBLAS/_apis/build/status/xianyi.OpenBLAS?branchName=develop)](https://dev.azure.com/xianyi/OpenBLAS/_build/latest?definitionId=1&branchName=develop)
-
-
 ## Introduction
+OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.

-OpenBLAS is an optimized BLAS (Basic Linear Algebra Subprograms) library based on GotoBLAS2 1.13 BSD version.
-
-Please read the documentation on the OpenBLAS wiki pages: <https://github.com/xianyi/OpenBLAS/wiki>.
-
-For a general introduction to the BLAS routines, please refer to the extensive documentation of their reference implementation hosted at netlib:
-<https://www.netlib.org/blas>. On that site you will likewise find documentation for the reference implementation of the higher-level library LAPACK - the **L**inear **A**lgebra **Pack**age that comes included with OpenBLAS. If you are looking for a general primer or refresher on Linear Algebra, the set of six
-20-minute lecture videos by Prof. Gilbert Strang on either MIT OpenCourseWare <https://ocw.mit.edu/resources/res-18-010-a-2020-vision-of-linear-algebra-spring-2020/> or Youtube <https://www.youtube.com/playlist?list=PLUl4u3cNGP61iQEFiWLE21EJCxwmWvvek> may be helpful.
+Please read the documents on OpenBLAS wiki pages <http://github.com/xianyi/OpenBLAS/wiki>.

 ## Binary Packages
-
-We provide official binary packages for the following platform:
+We provide binary packages for the following platform.

  * Windows x86/x86_64

-You can download them from [file hosting on sourceforge.net](https://sourceforge.net/projects/openblas/files/) or from the Releases section of the github project page, [https://github.com/xianyi/OpenBLAS/releases](https://github.com/xianyi/OpenBLAS/releases).
+You can download them from [file hosting on sourceforge.net](https://sourceforge.net/projects/openblas/files/).

 ## Installation from Source
+Download from project homepage. http://xianyi.github.com/OpenBLAS/

-Download from project homepage, https://xianyi.github.com/OpenBLAS/, or check out the code
-using Git from https://github.com/xianyi/OpenBLAS.git. (If you want the most up to date version, be
-sure to use the develop branch - master is several years out of date due to a change of maintainership.)
-Buildtime parameters can be chosen in Makefile.rule, see there for a short description of each option.
-Most can also be given directly on the make or cmake command line.
-
-### Dependencies
-
-Building OpenBLAS requires the following to be installed:
-
-* GNU Make
-* A C compiler, e.g. GCC or Clang
-* A Fortran compiler (optional, for LAPACK)
-* IBM MASS (optional, see below)
-
+Or, check out codes from git://github.com/xianyi/OpenBLAS.git
 ### Normal compile
-
-Simply invoking `make` (or `gmake` on BSD) will detect the CPU automatically.
-To set a specific target CPU, use `make TARGET=xxx`, e.g. `make TARGET=NEHALEM`.
-The full target list is in the file `TargetList.txt`. For building with `cmake`, the
-usual conventions apply, i.e. create a build directory either underneath the toplevel
-OpenBLAS source directory or separate from it, and invoke `cmake` there with the path
-to the source tree and any build options you plan to set.
+  * type "make" to detect the CPU automatically.
+  or
+  * type "make TARGET=xxx" to set target CPU, e.g. "make TARGET=NEHALEM". The full target list is in file TargetList.txt.

 ### Cross compile
-
-Set `CC` and `FC` to point to the cross toolchains, and set `HOSTCC` to your host C compiler.
-The target must be specified explicitly when cross compiling.
+Please set CC and FC with the cross toolchains. Then, set HOSTCC with your host C compiler. At last, set TARGET explicitly.

 Examples:

-* On an x86 box, compile this library for a loongson3a CPU:
-  ```sh
-  make BINARY=64 CC=mips64el-unknown-linux-gnu-gcc FC=mips64el-unknown-linux-gnu-gfortran HOSTCC=gcc TARGET=LOONGSON3A
-  ```
-  or same with the newer mips-crosscompiler put out by Loongson that defaults to the 32bit ABI:
-  ```sh
-  make HOSTCC=gcc CC='/opt/mips-loongson-gcc7.3-linux-gnu/2019.06-29/bin/mips-linux-gnu-gcc -mabi=64' FC='/opt/mips-loongson-gcc7.3-linux-gnu/2019.06-29/bin/mips-linux-gnu-gfortran -mabi=64' TARGET=LOONGSON3A
-  ```
+On X86 box, compile this library for loongson3a CPU.

-* On an x86 box, compile this library for a loongson3a CPU with loongcc (based on Open64) compiler:
-  ```sh
-  make CC=loongcc FC=loongf95 HOSTCC=gcc TARGET=LOONGSON3A CROSS=1 CROSS_SUFFIX=mips64el-st-linux-gnu-   NO_LAPACKE=1 NO_SHARED=1 BINARY=32
-  ```
+    make BINARY=64 CC=mips64el-unknown-linux-gnu-gcc FC=mips64el-unknown-linux-gnu-gfortran HOSTCC=gcc TARGET=LOONGSON3A
+
+On X86 box, compile this library for loongson3a CPU with loongcc (based on Open64) compiler.
+
+    make CC=loongcc FC=loongf95 HOSTCC=gcc TARGET=LOONGSON3A CROSS=1 CROSS_SUFFIX=mips64el-st-linux-gnu-   NO_LAPACKE=1 NO_SHARED=1 BINARY=32

 ### Debug version

-A debug version can be built using `make DEBUG=1`.
+    make DEBUG=1

-### Compile with MASS support on Power CPU (optional)
+### Compile with MASS Support on Power CPU (Optional dependency)

-The [IBM MASS](https://www.ibm.com/support/home/product/W511326D80541V01/other_software/mathematical_acceleration_subsystem) library consists of a set of mathematical functions for C, C++, and Fortran applications that are tuned for optimum performance on POWER architectures.
-OpenBLAS with MASS requires a 64-bit, little-endian OS on POWER.
-The library can be installed as shown:
+[IBM MASS](http://www-01.ibm.com/software/awdtools/mass/linux/mass-linux.html) library consists of a set of mathematical functions for C, C++, and
+Fortran-language applications that are tuned for optimum performance on POWER architectures. OpenBLAS with MASS requires 64-bit, little-endian OS on POWER.
+The library can be installed as below -

-* On Ubuntu:
-  ```sh
-  wget -q http://public.dhe.ibm.com/software/server/POWER/Linux/xl-compiler/eval/ppc64le/ubuntu/public.gpg -O- | sudo apt-key add -
-  echo "deb http://public.dhe.ibm.com/software/server/POWER/Linux/xl-compiler/eval/ppc64le/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/ibm-xl-compiler-eval.list
-  sudo apt-get update
-  sudo apt-get install libxlmass-devel.8.1.5
-  ```
+ * On Ubuntu:

-* On RHEL/CentOS:
-  ```sh
-  wget http://public.dhe.ibm.com/software/server/POWER/Linux/xl-compiler/eval/ppc64le/rhel7/repodata/repomd.xml.key
-  sudo rpm --import repomd.xml.key
-  wget http://public.dhe.ibm.com/software/server/POWER/Linux/xl-compiler/eval/ppc64le/rhel7/ibm-xl-compiler-eval.repo
-  sudo cp ibm-xl-compiler-eval.repo /etc/yum.repos.d/
-  sudo yum install libxlmass-devel.8.1.5
-  ```
+    wget -q http://public.dhe.ibm.com/software/server/POWER/Linux/xl-compiler/eval/ppc64le/ubuntu/public.gpg -O- | sudo apt-key add -</br>
+    echo "deb http://public.dhe.ibm.com/software/server/POWER/Linux/xl-compiler/eval/ppc64le/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/ibm-xl-compiler-eval.list</br>
+    sudo apt-get update</br>
+    sudo apt-get install libxlmass-devel.8.1.5</br>

-After installing the MASS library, compile OpenBLAS with `USE_MASS=1`.
-For example, to compile on Power8 with MASS support: `make USE_MASS=1 TARGET=POWER8`.
+ * On RHEL/CentOS:

-### Install to a specific directory (optional)
+    wget http://public.dhe.ibm.com/software/server/POWER/Linux/xl-compiler/eval/ppc64le/rhel7/repodata/repomd.xml.key</br>
+    sudo rpm --import repomd.xml.key</br>
+    wget http://public.dhe.ibm.com/software/server/POWER/Linux/xl-compiler/eval/ppc64le/rhel7/ibm-xl-compiler-eval.repo</br>
+    sudo cp ibm-xl-compiler-eval.repo /etc/yum.repos.d/</br>
+    sudo yum install libxlmass-devel.8.1.5</br>

-Use `PREFIX=` when invoking `make`, for example
+After installing MASS library, compile openblas with USE_MASS=1.

-```sh
-make install PREFIX=your_installation_directory
-```
+Example:

-The default installation directory is `/opt/OpenBLAS`.
+Compiling on Power8 with MASS support -

-## Supported CPUs and Operating Systems
+    make USE_MASS=1 TARGET=POWER8

-Please read `GotoBLAS_01Readme.txt` for older CPU models already supported by the 2010 GotoBLAS.
+### Install to the directory (optional)

-### Additional supported CPUs
+Example:

-#### x86/x86-64
+    make install PREFIX=your_installation_directory

+The default directory is /opt/OpenBLAS
+
+## Support CPU & OS
+Please read GotoBLAS_01Readme.txt
+
+### Additional support CPU:
+
+#### x86/x86-64:
 - **Intel Xeon 56xx (Westmere)**: Used GotoBLAS2 Nehalem codes.
 - **Intel Sandy Bridge**: Optimized Level-3 and Level-2 BLAS with AVX on x86-64.
- **Intel Haswell**: Optimized Level-3 and Level-2 BLAS with AVX2 and FMA on x86-64.
- **Intel Skylake-X**: Optimized Level-3 and Level-2 BLAS with AVX512 and FMA on x86-64.
- **Intel Cooper Lake**: as Skylake-X with improved BFLOAT16 support.
+- **Intel Haswell**: Optimized Level-3 and Level-2 BLAS with AVX2 and FMA  on x86-64.
 - **AMD Bobcat**: Used GotoBLAS2 Barcelona codes.
- **AMD Bulldozer**: x86-64 ?GEMM FMA4 kernels. (Thanks to Werner Saar)
+- **AMD Bulldozer**: x86-64 ?GEMM FMA4 kernels. (Thank Werner Saar)
 - **AMD PILEDRIVER**: Uses Bulldozer codes with some optimizations.
 - **AMD STEAMROLLER**: Uses Bulldozer codes with some optimizations.
- **AMD ZEN**: Uses Haswell codes with some optimizations.
-
-#### MIPS32
-
- **MIPS 1004K**: uses P5600 codes
- **MIPS 24K**: uses P5600 codes
-
-#### MIPS64

+#### MIPS64:
 - **ICT Loongson 3A**: Optimized Level-3 BLAS and the part of Level-1,2.
 - **ICT Loongson 3B**: Experimental

-#### ARM
+#### ARM:
+- **ARMV6**: Optimized BLAS for vfpv2 and vfpv3-d16 ( e.g. BCM2835, Cortex M0+ )
+- **ARMV7**: Optimized BLAS for vfpv3-d32 ( e.g. Cortex A8, A9 and A15 )

- **ARMv6**: Optimized BLAS for vfpv2 and vfpv3-d16 (e.g. BCM2835, Cortex M0+)
- **ARMv7**: Optimized BLAS for vfpv3-d32 (e.g. Cortex A8, A9 and A15)
+#### ARM64:
+- **ARMV8**: Experimental
+- **ARM Cortex-A57**: Experimental

-#### ARM64
-
- **ARMv8**: Basic ARMV8 with small caches, optimized Level-3 and Level-2 BLAS
- **Cortex-A53**: same as ARMV8 (different cpu specifications)
- **Cortex-A55**: same as ARMV8 (different cpu specifications)
- **Cortex A57**: Optimized Level-3 and Level-2 functions
- **Cortex A72**: same as A57 ( different cpu specifications)
- **Cortex A73**: same as A57 (different cpu specifications)
- **Falkor**: same as A57 (different cpu specifications)
- **ThunderX**: Optimized some Level-1 functions
- **ThunderX2T99**: Optimized Level-3 BLAS and parts of Levels 1 and 2
- **ThunderX3T110**
- **TSV110**: Optimized some Level-3 helper functions
- **EMAG 8180**: preliminary support based on A57
- **Neoverse N1**: (AWS Graviton2) preliminary support
- **Apple Vortex**: preliminary support based on ARMV8
-
-#### PPC/PPC64
-
- **POWER8**: Optimized BLAS, only for PPC64LE (Little Endian), only with `USE_OPENMP=1`
- **POWER9**: Optimized Level-3 BLAS (real) and some Level-1,2. PPC64LE with OpenMP only. 
- **POWER10**:
-
-#### IBM zEnterprise System
-
- **Z13**: Optimized Level-3 BLAS and Level-1,2
- **Z14**: Optimized Level-3 BLAS and (single precision) Level-1,2
-
-#### RISC-V
-
- **C910V**: Optimized Level-3 BLAS (real) and Level-1,2 by RISC-V Vector extension 0.7.1.
-  ```sh
-  make HOSTCC=gcc TARGET=C910V CC=riscv64-unknown-linux-gnu-gcc FC=riscv64-unknown-linux-gnu-gfortran
-  ```
-  (also known to work on C906)
-
-### Support for multiple targets in a single library
-
-OpenBLAS can be built for multiple targets with runtime detection of the target cpu by specifiying `DYNAMIC_ARCH=1` in Makefile.rule, on the gmake command line or as `-DDYNAMIC_ARCH=TRUE` in cmake.
-
-For **x86_64**, the list of targets this activates contains Prescott, Core2, Nehalem, Barcelona, Sandybridge, Bulldozer, Piledriver, Steamroller, Excavator, Haswell, Zen, SkylakeX. For cpu generations not included in this list, the corresponding older model is used. If you also specify `DYNAMIC_OLDER=1`, specific support for Penryn, Dunnington, Opteron, Opteron/SSE3, Bobcat, Atom and Nano is added. Finally there is an option `DYNAMIC_LIST` that allows to specify an individual list of targets to include instead of the default.
-
-`DYNAMIC_ARCH` is also supported on **x86**, where it translates to Katmai, Coppermine, Northwood, Prescott, Banias,
-Core2, Penryn, Dunnington, Nehalem, Athlon, Opteron, Opteron_SSE3, Barcelona, Bobcat, Atom and Nano.
-
-On **ARMV8**, it enables support for CortexA53, CortexA57, CortexA72, CortexA73, Falkor, ThunderX, ThunderX2T99, TSV110 as well as generic ARMV8 cpus.
-
-For **POWER**, the list encompasses POWER6, POWER8 and POWER9, on **ZARCH** it comprises Z13 and Z14.
-
-The `TARGET` option can be used in conjunction with `DYNAMIC_ARCH=1` to specify which cpu model should be assumed for all the
-common code in the library, usually you will want to set this to the oldest model you expect to encounter.
-Please note that it is not possible to combine support for different architectures, so no combined 32 and 64 bit or x86_64 and arm64 in the same library.
-
-### Supported OS
+#### IBM zEnterprise System:
+- **Z13**: Optimized Level-3 BLAS 
+     

+### Support OS:
 - **GNU/Linux**
- **MinGW or Visual Studio (CMake)/Windows**: Please read <https://github.com/xianyi/OpenBLAS/wiki/How-to-use-OpenBLAS-in-Microsoft-Visual-Studio>.
- **Darwin/macOS/OSX/iOS**: Experimental. Although GotoBLAS2 already supports Darwin, we are not OSX/iOS experts.
- **FreeBSD**: Supported by the community. We don't actively test the library on this OS.
- **OpenBSD**: Supported by the community. We don't actively test the library on this OS.
- **NetBSD**: Supported by the community. We don't actively test the library on this OS.
- **DragonFly BSD**: Supported by the community. We don't actively test the library on this OS.
- **Android**: Supported by the community. Please read <https://github.com/xianyi/OpenBLAS/wiki/How-to-build-OpenBLAS-for-Android>.
- **AIX**: Supported on PPC up to POWER8
- **Haiku**: Supported by the community. We don't actively test the library on this OS.
- **SunOS**: Supported by the community. We don't actively test the library on this OS.
- **Cortex-M**: Supported by the community. Please read <https://github.com/xianyi/OpenBLAS/wiki/How-to-use-OpenBLAS-on-Cortex-M>.
+- **MingWin or Visual Studio(CMake)/Windows**: Please read <https://github.com/xianyi/OpenBLAS/wiki/How-to-use-OpenBLAS-in-Microsoft-Visual-Studio>.
+- **Darwin/Mac OS X**: Experimental. Although GotoBLAS2 supports Darwin, we are the beginner on Mac OS X.
+- **FreeBSD**: Supported by community. We didn't test the library on this OS.
+- **Android**: Supported by community. Please read <https://github.com/xianyi/OpenBLAS/wiki/How-to-build-OpenBLAS-for-Android>.

-## Usage
+## Usages
+Link with libopenblas.a or -lopenblas for shared library.

-Statically link with `libopenblas.a` or dynamically link with `-lopenblas` if OpenBLAS was
-compiled as a shared library.
+### Set the number of threads with environment variables.

-### Setting the number of threads using environment variables
+Examples:

-Environment variables are used to specify a maximum number of threads.
-For example,
+    export OPENBLAS_NUM_THREADS=4

-```sh
-export OPENBLAS_NUM_THREADS=4
-export GOTO_NUM_THREADS=4
-export OMP_NUM_THREADS=4
-```
+ or

-The priorities are `OPENBLAS_NUM_THREADS` > `GOTO_NUM_THREADS` > `OMP_NUM_THREADS`.
+    export GOTO_NUM_THREADS=4

-If you compile this library with `USE_OPENMP=1`, you should set the `OMP_NUM_THREADS`
-environment variable; OpenBLAS ignores `OPENBLAS_NUM_THREADS` and `GOTO_NUM_THREADS` when
-compiled with `USE_OPENMP=1`.
+ or

-### Setting the number of threads at runtime
+    export OMP_NUM_THREADS=4

-We provide the following functions to control the number of threads at runtime:
+The priorities are OPENBLAS_NUM_THREADS > GOTO_NUM_THREADS > OMP_NUM_THREADS.

-```c
-void goto_set_num_threads(int num_threads);
-void openblas_set_num_threads(int num_threads);
-```
-Note that these are only used once at library initialization, and are not available for
-fine-tuning thread numbers in individual BLAS calls. 
-If you compile this library with `USE_OPENMP=1`, you should use the above functions too.
+If you compile this lib with USE_OPENMP=1, you should set OMP_NUM_THREADS environment variable. OpenBLAS ignores OPENBLAS_NUM_THREADS and GOTO_NUM_THREADS with USE_OPENMP=1.

-## Reporting bugs
+### Set the number of threads on runtime.

-Please submit an issue in https://github.com/xianyi/OpenBLAS/issues.
+We provided the below functions to control the number of threads on runtime.
+
+    void goto_set_num_threads(int num_threads);
+
+    void openblas_set_num_threads(int num_threads);
+
+If you compile this lib with USE_OPENMP=1, you should use the above functions, too.
+
+## Report Bugs
+Please add a issue in https://github.com/xianyi/OpenBLAS/issues

 ## Contact
-
 * OpenBLAS users mailing list: https://groups.google.com/forum/#!forum/openblas-users
 * OpenBLAS developers mailing list: https://groups.google.com/forum/#!forum/openblas-dev

-## Change log
-
-Please see Changelog.txt to view the differences between OpenBLAS and GotoBLAS2 1.13 BSD version.
+## ChangeLog
+Please see Changelog.txt to obtain the differences between GotoBLAS2 1.13 BSD version.

 ## Troubleshooting
-
-* Please read the [FAQ](https://github.com/xianyi/OpenBLAS/wiki/Faq) first.
-* Please use GCC version 4.6 and above to compile Sandy Bridge AVX kernels on Linux/MinGW/BSD.
-* Please use Clang version 3.1 and above to compile the library on Sandy Bridge microarchitecture.
-  Clang 3.0 will generate the wrong AVX binary code.
-* Please use GCC version 6 or LLVM version 6 and above to compile Skylake AVX512 kernels.
-* The number of CPUs/cores should be less than or equal to 256. On Linux `x86_64` (`amd64`),
-  there is experimental support for up to 1024 CPUs/cores and 128 numa nodes if you build
-  the library with `BIGNUMA=1`.
-* OpenBLAS does not set processor affinity by default.
-  On Linux, you can enable processor affinity by commenting out the line `NO_AFFINITY=1` in
-  Makefile.rule. However, note that this may cause
-  [a conflict with R parallel](https://stat.ethz.ch/pipermail/r-sig-hpc/2012-April/001348.html).
-* On Loongson 3A, `make test` may fail with a `pthread_create` error (`EAGAIN`).
-  However, it will be okay when you run the same test case on the shell.
+* Please read [Faq](https://github.com/xianyi/OpenBLAS/wiki/Faq) at first.
+* Please use gcc version 4.6 and above to compile Sandy Bridge AVX kernels on Linux/MingW/BSD.
+* Please use Clang version 3.1 and above to compile the library on Sandy Bridge microarchitecture. The Clang 3.0 will generate the wrong AVX binary code.
+* The number of CPUs/Cores should less than or equal to 256. On Linux x86_64(amd64), there is experimental support for up to 1024 CPUs/Cores and 128 numa nodes if you build the library with BIGNUMA=1.
+* OpenBLAS does not set processor affinity by default. On Linux, you can enable processor affinity by commenting the line NO_AFFINITY=1 in Makefile.rule. But this may cause [the conflict with R parallel](https://stat.ethz.ch/pipermail/r-sig-hpc/2012-April/001348.html).
+* On Loongson 3A. make test would be failed because of pthread_create error. The error code is EAGAIN. However, it will be OK when you run the same testcase on shell.

 ## Contributing
-
-1. [Check for open issues](https://github.com/xianyi/OpenBLAS/issues) or open a fresh issue
-   to start a discussion around a feature idea or a bug.
-2. Fork the [OpenBLAS](https://github.com/xianyi/OpenBLAS) repository to start making your changes.
-3. Write a test which shows that the bug was fixed or that the feature works as expected.
-4. Send a pull request. Make sure to add yourself to `CONTRIBUTORS.md`.
+1. [Check for open issues](https://github.com/xianyi/OpenBLAS/issues) or open a fresh issue to start a discussion around a feature idea or a bug.
+1. Fork the [OpenBLAS](https://github.com/xianyi/OpenBLAS) repository to start making your changes.
+1. Write a test which shows that the bug was fixed or that the feature works as expected.
+1. Send a pull request. Make sure to add yourself to `CONTRIBUTORS.md`.

 ## Donation
-
 Please read [this wiki page](https://github.com/xianyi/OpenBLAS/wiki/Donation).
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,20 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-It is generally recommended to use the latest release as this project
-does not maintain multiple stable branches and providing packages e.g.
-for Linux distributions is outside our scope. In particular, versions
-before 0.3.18 can be assumed to carry the out-of-bounds-read error in
-the LAPACK ?LARRV family of functions that was the subject of 
-CVE-2021-4048
-
-## Reporting a Vulnerability
-
-If you suspect that you have found a vulnerability - a defect that could
-be abused to compromise the security of a user's code or systems - please
-do not use the normal github issue tracker (except perhaps to post a general
-warning if you deem that necessary). Instead, please contact the project 
-maintainers through the email addresses given in their github user profiles.
-Defects found in the "lapack-netlib" subtree should ideally be reported to
-the maintainers of the reference implementation of LAPACK, lapack@icl.itk.edu
--- a/TargetList.txt
+++ b/TargetList.txt
@@ -20,10 +20,7 @@ DUNNINGTON
 NEHALEM
 SANDYBRIDGE
 HASWELL
-SKYLAKEX
 ATOM
-COOPERLAKE
-SAPPHIRERAPIDS

 b)AMD CPU:
 ATHLON
@@ -50,8 +47,6 @@ POWER5
 POWER6
 POWER7
 POWER8
-POWER9
-POWER10
 PPCG4
 PPC970
 PPC970MP
@@ -61,17 +56,13 @@ CELL

 3.MIPS CPU:
 P5600
-MIPS1004K
-MIPS24K

 4.MIPS64 CPU:
-MIPS64_GENERIC
 SICORTEX
 LOONGSON3A
 LOONGSON3B
 I6400
 P6600
-I6500

 5.IA64 CPU:
 ITANIUM2
@@ -89,47 +80,8 @@ ARMV5

 8.ARM 64-bit CPU:
 ARMV8
-CORTEXA53
 CORTEXA57
-CORTEXA72
-CORTEXA73
-CORTEXA510
-CORTEXA710
-CORTEXX1
-CORTEXX2
-NEOVERSEN1
-NEOVERSEV1
-NEOVERSEN2
-CORTEXA55
-EMAG8180
-FALKOR
+VULCAN
 THUNDERX
 THUNDERX2T99
-TSV110
-THUNDERX3T110
-VORTEX
-A64FX
-ARMV8SVE
-FT2000

-9.System Z:
-ZARCH_GENERIC
-Z13
-Z14
-
-10.RISC-V 64:
-RISCV64_GENERIC
-C910V
-
-11.LOONGARCH64:
-LOONGSONGENERIC
-LOONGSON3R5
-LOONGSON2K1000
-
-12. Elbrus E2000:
-E2K
-
-13. Alpha
-EV4
-EV5
-EV6
--- a/USAGE.md
+++ b/USAGE.md
@@ -14,20 +14,6 @@ Please build OpenBLAS with larger `NUM_THREADS`. For example, `make
 NUM_THREADS=32` or `make NUM_THREADS=64`.  In `Makefile.system`, we will set
 `MAX_CPU_NUMBER=NUM_THREADS`.

-Despite its name, and due to the use of memory buffers in functions like SGEMM,
-the setting of NUM_THREADS can be relevant even for a single-threaded build 
-of OpenBLAS, if such functions get called by multiple threads of a program
-that uses OpenBLAS. In some cases, the affected code may simply crash or throw 
-a segmentation fault without displaying the above warning first.
-
-Note that the number of threads used at runtime can be altered to differ from the
-value NUM_THREADS was set to at build time. At runtime, the actual number of
-threads can be set anywhere from 1 to the build's NUM_THREADS (note however,
-that this does not change the number of memory buffers that will be allocated,
-which is set at build time). The number of threads for a process can be set by
-using the mechanisms described below.
-
-
 #### How can I use OpenBLAS in multi-threaded applications?

 If your application is already multi-threaded, it will conflict with OpenBLAS
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,8 +5,6 @@ version: 0.2.19.{build}
 platform: 
  - x64

-os: Visual Studio 2017
-
 configuration: Release

 clone_folder: c:\projects\OpenBLAS
@@ -14,65 +12,33 @@ clone_folder: c:\projects\OpenBLAS
 init:
  - git config --global core.autocrlf input

+build:
+  project: OpenBLAS.sln
+
 clone_depth: 5

+#branches to build
+branches:
+  only:
+    - master
+    - develop
+    - cmake
+
 skip_tags: true

 matrix:
-  fast_finish: false
+  fast_finish: true

 skip_commits:
 # Add [av skip] to commit messages
  message: /\[av skip\]/

-environment:
-  global:
-    CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
-  matrix:
-#    - COMPILER: clang-cl
-#      WITH_FORTRAN: ON
-#    - COMPILER: clang-cl
-#      DYNAMIC_ARCH: ON
-#      WITH_FORTRAN: OFF
-#    - COMPILER: cl
-#    - COMPILER: MinGW64-gcc-7.2.0-mingw
-#      DYNAMIC_ARCH: OFF
-#      WITH_FORTRAN: ignore
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      COMPILER: MinGW-gcc-6.3.0-32   
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      COMPILER: MinGW-gcc-5.3.0
-      WITH_FORTRAN: ignore
-    
-install:
-  - if [%COMPILER%]==[clang-cl] call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
-  - if [%COMPILER%]==[clang-cl] conda update --yes -n base conda
-  - if [%COMPILER%]==[clang-cl] conda config --add channels conda-forge --force
-  - if [%COMPILER%]==[clang-cl] conda config --set auto_update_conda false
-  - if [%COMPILER%]==[clang-cl] conda install --yes --quiet clangdev cmake ninja flang=11.0.1
-  - if [%COMPILER%]==[clang-cl] call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
-  - if [%COMPILER%]==[clang-cl] set "LIB=%CONDA_INSTALL_LOCN%\Library\lib;%LIB%"
-  - if [%COMPILER%]==[clang-cl] set "CPATH=%CONDA_INSTALL_LOCN%\Library\include;%CPATH%"
-
 before_build:
-  - ps: if (-Not (Test-Path .\build)) { mkdir build }
-  - cd build
-  - set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
-  - if [%COMPILER%]==[MinGW-gcc-5.3.0] set PATH=C:\MinGW\bin;C:\msys64\usr\bin;C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
-  - if [%COMPILER%]==[MinGW64-gcc-7.2.0-mingw] set PATH=C:\MinGW\bin;C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
-  - if [%COMPILER%]==[MinGW-gcc-6.3.0-32] set PATH=C:\msys64\usr\bin;C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw64\bin;%PATH%
-  - if [%COMPILER%]==[cl] cmake -G "Visual Studio 15 2017 Win64" ..
-  - if [%COMPILER%]==[MinGW64-gcc-7.2.0-mingw] cmake -G "MinGW Makefiles" -DNOFORTRAN=1 ..
-  - if [%COMPILER%]==[MinGW-gcc-6.3.0-32] cmake -G "MSYS Makefiles" -DNOFORTRAN=1 ..
-  - if [%COMPILER%]==[MinGW-gcc-5.3.0] cmake -G "MSYS Makefiles" -DNOFORTRAN=1 ..
-  - if [%WITH_FORTRAN%]==[OFF] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_MT=mt -DMSVC_STATIC_CRT=ON ..
-  - if [%WITH_FORTRAN%]==[ON] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DCMAKE_MT=mt -DBUILD_WITHOUT_LAPACK=no -DNOFORTRAN=0 ..
-  - if [%USE_OPENMP%]==[ON] cmake -DUSE_OPENMP=ON ..
-  - if [%DYNAMIC_ARCH%]==[ON] cmake -DDYNAMIC_ARCH=ON -DDYNAMIC_LIST='CORE2;NEHALEM;SANDYBRIDGE;BULLDOZER;HASWELL' ..
-
-build_script:
-  - cmake --build .
+  - echo Running cmake...
+  - cd c:\projects\OpenBLAS
+  - cmake -G "Visual Studio 12 Win64" .

 test_script:
-  - ctest -j2
-  
+  - echo Running Test
+  - cd c:\projects\OpenBLAS\utest
+  - openblas_utest
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,292 +0,0 @@
-trigger:
-  # start a new build for every push
-  batch: False
-  branches:
-    include:
-      - develop
-resources:
-  containers:
-      - container: oneapi-hpckit
-        image: intel/oneapi-hpckit:latest
-        options: '-v /usr/bin/sudo:/usr/bin/sudo -v /usr/lib/sudo/libsudo_util.so.0:/usr/lib/sudo/libsudo_util.so.0 -v /usr/lib/sudo/sudoers.so:/usr/lib/sudo/sudoers.so'
-      - container: oneapi-basekit
-        image: intel/oneapi-basekit:latest
-        options: '-v /usr/bin/sudo:/usr/bin/sudo -v /usr/lib/sudo/libsudo_util.so.0:/usr/lib/sudo/libsudo_util.so.0 -v /usr/lib/sudo/sudoers.so:/usr/lib/sudo/sudoers.so'
- 
-jobs:
-# manylinux1 is useful to test because the
-# standard Docker container uses an old version
-# of gcc / glibc
- job: manylinux1_gcc
-  pool:
-    vmImage: 'ubuntu-latest'
-  steps:
-  - script: |
-      echo "FROM quay.io/pypa/manylinux1_x86_64
-        COPY . /tmp/openblas
-        RUN cd /tmp/openblas                                      &&  \
-            COMMON_FLAGS='DYNAMIC_ARCH=1 TARGET=NEHALEM NUM_THREADS=32' && \
-            BTYPE='BINARY=64' CC=gcc && \
-            make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE && \
-            make -C test $COMMON_FLAGS $BTYPE && \
-            make -C ctest $COMMON_FLAGS $BTYPE && \
-            make -C utest $COMMON_FLAGS $BTYPE" > Dockerfile
-      docker build .
-    displayName: Run manylinux1 docker build
- job: Intel_SDE_skx
-  pool:
-    vmImage: 'ubuntu-latest'
-  steps:
-  - script: |
-      # at the time of writing the available Azure Ubuntu vm image
-      # does not support AVX512VL, so use more recent LTS version
-      echo "FROM ubuntu:bionic
-      COPY . /tmp/openblas
-      RUN apt-get -y update && apt-get -y install \\
-          cmake \\
-          gfortran \\
-          make \\
-          wget
-      RUN mkdir /tmp/SDE && cd /tmp/SDE && \\
-          mkdir sde-external-8.35.0-2019-03-11-lin && \\
-          wget --quiet -O sde-external-8.35.0-2019-03-11-lin.tar.bz2 https://www.dropbox.com/s/fopsnzj67572sj5/sde-external-8.35.0-2019-03-11-lin.tar.bz2?dl=0 && \\
-          tar -xjvf sde-external-8.35.0-2019-03-11-lin.tar.bz2 -C /tmp/SDE/sde-external-8.35.0-2019-03-11-lin --strip-components=1
-      RUN cd /tmp/openblas && CC=gcc make QUIET_MAKE=1 DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64
-      CMD cd /tmp/openblas && echo 0 > /proc/sys/kernel/yama/ptrace_scope && CC=gcc OPENBLAS_VERBOSE=2 /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/skx/cpuid.def -- make -C utest DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64" > Dockerfile
-      docker build -t intel_sde .
-      # we need a privileged docker run for sde process attachment
-      docker run --privileged intel_sde
-    displayName: 'Run AVX512 SkylakeX docker build / test'
-
- job: Windows_cl
-  pool:
-     vmImage: 'windows-latest'
-  steps:   
-  - task: CMake@1
-    inputs:
-      workingDirectory: 'build' # Optional
-      cmakeArgs: '-G "Visual Studio 17 2022" ..'
-  - task: CMake@1
-    inputs:
-      cmakeArgs: '--build . --config Release'
-      workingDirectory: 'build'
-  - script: |
-      cd build
-      cd utest
-      dir
-      openblas_utest.exe
-
- job: Windows_mingw_gmake
-  pool:
-     vmImage: 'windows-latest'
-  steps:   
-  - script: |
-      mingw32-make CC=gcc FC=gfortran DYNAMIC_ARCH=1 DYNAMIC_LIST="SANDYBRIDGE"
-
- job: Windows_clang_cmake
-  pool:
-     vmImage: 'windows-latest'
-  steps:
-  - script: |
-      set "PATH=C:\Miniconda\Scripts;C:\Miniconda\Library\bin;C:\Miniconda\Library\usr\bin;C:\Miniconda\condabin;%PATH%"
-      set "LIB=C:\Miniconda\Library\lib;%LIB%"
-      set "CPATH=C:\Miniconda\Library\include;%CPATH%
-      conda config --add channels conda-forge --force
-      conda config --set auto_update_conda false
-      conda install --yes ninja
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-      mkdir build 
-      cd build
-      cmake -G "Ninja" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_MT=mt -DCMAKE_BUILD_TYPE=Release -DNOFORTRAN=1 -DMSVC_STATIC_CRT=ON ..
-      cmake --build . --config Release
-      ctest
-
- job: Windows_flang_clang
-  pool:
-     vmImage: 'windows-2022'
-  steps:
-  - script: |
-      set "PATH=C:\Miniconda\Scripts;C:\Miniconda\Library\bin;C:\Miniconda\Library\usr\bin;C:\Miniconda\condabin;%PATH%"
-      set "LIB=C:\Miniconda\Library\lib;%LIB%"
-      set "CPATH=C:\Miniconda\Library\include;%CPATH%"
-      conda config --add channels conda-forge --force
-      conda config --set auto_update_conda false
-      conda install --yes --quiet ninja flang
-      mkdir build 
-      cd build
-      call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-      cmake -G "Ninja" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DBUILD_TESTING=OFF -DCMAKE_MT=mt -DCMAKE_BUILD_TYPE=Release -DMSVC_STATIC_CRT=ON ..
-      cmake --build . --config Release
-      ctest
-
- job: Windows_cl_flang
-  pool:
-     vmImage: 'windows-2022'
-  steps:
-  - script: |
-      set "PATH=C:\Miniconda\Scripts;C:\Miniconda\Library\bin;C:\Miniconda\Library\usr\bin;C:\Miniconda\condabin;%PATH%"
-      set "LIB=C:\Miniconda\Library\lib;%LIB%"
-      set "CPATH=C:\Miniconda\Library\include;%CPATH%"
-      conda config --add channels conda-forge --force
-      conda config --set auto_update_conda false
-      conda install --yes --quiet ninja flang
-      mkdir build 
-      cd build
-      call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-      cmake -G "Ninja" -DCMAKE_C_COMPILER=cl -DCMAKE_Fortran_COMPILER=flang -DC_LAPACK=1 -DCMAKE_MT=mt -DCMAKE_BUILD_TYPE=Release -DMSVC_STATIC_CRT=ON ..
-      cmake --build . --config Release
-      ctest
-
-
-
- job: OSX_OpenMP
-  pool:
-     vmImage: 'macOS-11'
-  steps:   
-  - script: |
-      brew update
-      make TARGET=CORE2 DYNAMIC_ARCH=1 USE_OPENMP=1 INTERFACE64=1 CC=gcc-10 FC=gfortran-10
-      make TARGET=CORE2 DYNAMIC_ARCH=1 USE_OPENMP=1 INTERFACE64=1 CC=gcc-10 FC=gfortran-10 PREFIX=../blasinst install
-      ls -lR ../blasinst
-     
- job: OSX_GCC_Nothreads
-  pool:
-     vmImage: 'macOS-11'
-  steps:   
-  - script: |
-      brew update
-      make USE_THREADS=0 CC=gcc-10 FC=gfortran-10
-     
- job: OSX_GCC12
-  pool:
-     vmImage: 'macOS-latest'
-  steps:   
-  - script: |
-      brew update
-      make CC=gcc-12 FC=gfortran-12
-     
- job: OSX_OpenMP_Clang
-  pool:
-     vmImage: 'macOS-11'
-  variables:
-     LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
-     LIBRARY_PATH: /usr/local/opt/llvm/lib
-     MACOSX_DEPLOYMENT_TARGET: 11.0
-  steps:   
-  - script: |
-      brew update
-      brew install llvm libomp
-      make TARGET=CORE2 USE_OPENMP=1 DYNAMIC_ARCH=1 CC=/usr/local/opt/llvm/bin/clang NOFORTRAN=1
-
- job: OSX_OpenMP_Clang_cmake
-  pool:
-     vmImage: 'macOS-11'
-  variables:
-     LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
-     LIBRARY_PATH: /usr/local/opt/llvm/lib
-  steps:   
-  - script: |
-      brew update
-      brew install llvm libomp
-      mkdir build
-      cd build
-      cmake -DTARGET=CORE2 -DUSE_OPENMP=1 -DINTERFACE64=1 -DDYNAMIC_ARCH=1 -DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang -DNOFORTRAN=1 -DNO_AVX512=1 ..
-      make
-      ctest
-      
- job: OSX_dynarch_cmake
-  pool:
-     vmImage: 'macOS-11'
-  variables:
-     LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
-     LIBRARY_PATH: /usr/local/opt/llvm/lib
-  steps:   
-  - script: |
-      mkdir build
-      cd build
-      cmake -DTARGET=CORE2 -DDYNAMIC_ARCH=1 -DDYNAMIC_LIST='NEHALEM HASWELL SKYLAKEX' -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_Fortran_COMPILER=gfortran-10 -DBUILD_SHARED_LIBS=ON ..
-      cmake --build .
-      ctest
-
- job: OSX_Ifort_Clang
-  pool:
-     vmImage: 'macOS-11'
-  variables:
-     LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
-     MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17643/m_HPCKit_p_2021.2.0.2903_offline.dmg
-     LIBRARY_PATH: /usr/local/opt/llvm/lib
-     MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
-  steps:   
-  - script: |
-      brew update
-      brew install llvm libomp
-      sudo mkdir -p /opt/intel
-      sudo chown $USER /opt/intel
-    displayName: prepare for cache restore
-  - task: Cache@2
-    inputs:
-      path: /opt/intel/oneapi
-      key: '"install" | "$(MACOS_HPCKIT_URL)" | "$(MACOS_FORTRAN_COMPONENTS)"'
-      cacheHitVar: CACHE_RESTORED
-  - script: | 
-      curl --output webimage.dmg --url $(MACOS_HPCKIT_URL) --retry 5 --retry-delay 5
-      hdiutil attach webimage.dmg
-      sudo /Volumes/"$(basename "$(MACOS_HPCKIT_URL)" .dmg)"/bootstrapper.app/Contents/MacOS/bootstrapper -s --action install --components="$(MACOS_FORTRAN_COMPONENTS)" --eula=accept --continue-with-optional-error=yes --log-dir=.
-      installer_exit_code=$?
-      hdiutil detach /Volumes/"$(basename "$URL" .dmg)" -quiet
-      exit $installer_exit_code
-    displayName: install
-    condition: ne(variables.CACHE_RESTORED, 'true')
-  - script: | 
-      source /opt/intel/oneapi/setvars.sh
-      make CC=/usr/local/opt/llvm/bin/clang FC=ifort
- 
- job: OSX_NDK_ARMV7
-  pool:
-     vmImage: 'macOS-11'
-  steps:   
-  - script: | 
-      brew update
-      brew install --cask android-ndk
-      export ANDROID_NDK_HOME=/usr/local/share/android-ndk
-      make TARGET=ARMV7 ONLY_CBLAS=1 CC=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi21-clang AR=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar HOSTCC=gcc ARM_SOFTFP_ABI=1 -j4
-
- job: OSX_IOS_ARMV8
-  pool:
-     vmImage: 'macOS-11'
-  variables:
-     CC: /Applications/Xcode_12.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
-     CFLAGS: -O2 -Wno-macro-redefined -isysroot /Applications/Xcode_12.4.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.4.sdk -arch arm64 -miphoneos-version-min=10.0
-  steps:
-  - script: |
-     make TARGET=ARMV8 DYNAMIC_ARCH=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1
-
- job: OSX_IOS_ARMV7
-  pool:
-     vmImage: 'macOS-11'
-  variables:
-     CC: /Applications/Xcode_12.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
-     CFLAGS: -O2 -mno-thumb -Wno-macro-redefined -isysroot /Applications/Xcode_12.4.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.4.sdk -arch armv7 -miphoneos-version-min=5.1
-  steps:
-  - script: |
-     make TARGET=ARMV7 DYNAMIC_ARCH=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1
-
- job: ALPINE_MUSL
-  pool:
-     vmImage: 'ubuntu-latest'
-  steps:
-  - script: |
-        wget https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/v0.13.2/alpine-chroot-install \
-          && echo '60c7e0b5d82e21d1a549fc9a46ba3b36688c09dc  alpine-chroot-install' | sha1sum -c \
-          || exit 1
-        alpine() { /alpine/enter-chroot -u "$USER" "$@"; }
-        sudo sh alpine-chroot-install -p 'build-base gfortran perl linux-headers sudo'
-        alpine make DYNAMIC_ARCH=1 BINARY=64
-        alpine make DYNAMIC_ARCH=1 BINARY=64 PREFIX=mytestdir install
-        alpine ls -l mytestdir/include
-        alpine echo "// tests that inclusion of openblas_config.h works with musl" >test_install.c
-        alpine echo "#include <openblas_config.h>" >>test_install.c
-        alpine echo "int main(){" >> test_install.c
-        alpine echo "cpu_set_t* cpu_set = NULL;}" >>test_install.c
-        alpine gcc -Imytestdir/include test_install.c -Lmytestdir/lib -lopenblas -lpthread -lgfortran -o test_install
-        
--- a/benchmark/Makefile
+++ b/benchmark/Makefile
--- a/benchmark/amax.c
+++ b/benchmark/amax.c
@@ -1,133 +0,0 @@
-/***************************************************************************
-Copyright (c) 2016, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef AMAX
-
-#ifdef COMPLEX
-#ifdef DOUBLE
-#define AMAX BLASFUNC(dzamax)
-#else
-#define AMAX BLASFUNC(scamax)
-#endif
-#else
-#ifdef DOUBLE
-#define AMAX BLASFUNC(damax)
-#else
-#define AMAX BLASFUNC(samax)
-#endif
-#endif
-
-int main(int argc, char *argv[])
-{
-
-  FLOAT *x;
-  blasint m, i;
-  blasint inc_x = 1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from = 1;
-  int to = 200;
-  int step = 1;
-
-  double time1, timeg;
-
-  argc--;
-  argv++;
-
-  if (argc > 0)
-  {
-    from = atol(*argv);
-    argc--;
-    argv++;
-  }
-  if (argc > 0)
-  {
-    to = MAX(atol(*argv), from);
-    argc--;
-    argv++;
-  }
-  if (argc > 0)
-  {
-    step = atol(*argv);
-    argc--;
-    argv++;
-  }
-
-  if ((p = getenv("OPENBLAS_LOOPS")))
-    loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))
-    inc_x = atoi(p);
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Loops = %d\n", from, to, step, inc_x, loops);
-
-  if ((x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL)
-  {
-    fprintf(stderr, "Out of Memory!!\n");
-    exit(1);
-  }
-
-#ifdef __linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for (m = from; m <= to; m += step)
-  {
-
-    timeg = 0;
-    fprintf(stderr, " %6d : ", (int)m);
-
-    for (l = 0; l < loops; l++)
-    {
-
-      for (i = 0; i < m * COMPSIZE * abs(inc_x); i++)
-      {
-        x[i] = ((FLOAT)rand() / (FLOAT)RAND_MAX) - 0.5;
-      }
-
-      begin();
-      AMAX(&m, x, &inc_x);
-      end();
-      timeg += getsec();
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr,
-            " %10.2f MFlops %10.6f sec\n",
-            COMPSIZE * sizeof(FLOAT) * 1. * (double)m / timeg * 1.e-6, timeg);
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/amin.c
+++ b/benchmark/amin.c
@@ -1,137 +0,0 @@
-/***************************************************************************
-Copyright (c) 2016, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef AMIN
-
-#ifdef COMPLEX
-#ifdef DOUBLE
-#define AMIN BLASFUNC(dzamin)
-#else
-#define AMIN BLASFUNC(scamin)
-#endif
-#else
-#ifdef DOUBLE
-#define AMIN BLASFUNC(damin)
-#else
-#define AMIN BLASFUNC(samin)
-#endif
-#endif
-
-int main(int argc, char *argv[])
-{
-
-  FLOAT *x;
-  blasint m, i;
-  blasint inc_x = 1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from = 1;
-  int to = 200;
-  int step = 1;
-
-  double time1, timeg;
-
-  argc--;
-  argv++;
-
-  if (argc > 0)
-  {
-    from = atol(*argv);
-    argc--;
-    argv++;
-  }
-  if (argc > 0)
-  {
-    to = MAX(atol(*argv), from);
-    argc--;
-    argv++;
-  }
-  if (argc > 0)
-  {
-    step = atol(*argv);
-    argc--;
-    argv++;
-  }
-
-  if ((p = getenv("OPENBLAS_LOOPS")))
-    loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))
-    inc_x = atoi(p);
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Loops = %d\n", from, to, step, inc_x, loops);
-
-  if ((x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL)
-  {
-    fprintf(stderr, "Out of Memory!!\n");
-    exit(1);
-  }
-
-#ifdef __linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for (m = from; m <= to; m += step)
-  {
-
-    timeg = 0;
-
-    fprintf(stderr, " %6d : ", (int)m);
-
-    for (l = 0; l < loops; l++)
-    {
-
-      for (i = 0; i < m * COMPSIZE * abs(inc_x); i++)
-      {
-        x[i] = ((FLOAT)rand() / (FLOAT)RAND_MAX) - 0.5;
-      }
-
-      begin();
-
-      AMIN(&m, x, &inc_x);
-
-      end();
-
-      timeg += getsec();
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr,
-            " %10.2f MFlops %10.6f sec\n",
-            COMPSIZE * sizeof(FLOAT) * 1. * (double)m / timeg * 1.e-6, timeg);
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/asum.c
+++ b/benchmark/asum.c
@@ -25,108 +25,169 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef ASUM

 #ifdef COMPLEX
 #ifdef DOUBLE
-#define ASUM BLASFUNC(dzasum)
+#define ASUM   BLASFUNC(dzasum)
 #else
-#define ASUM BLASFUNC(scasum)
+#define ASUM   BLASFUNC(scasum)
 #endif
 #else
 #ifdef DOUBLE
-#define ASUM BLASFUNC(dasum)
+#define ASUM   BLASFUNC(dasum)
 #else
-#define ASUM BLASFUNC(sasum)
+#define ASUM   BLASFUNC(sasum)
 #endif
 #endif

-int main(int argc, char *argv[])
-{
+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
+int main(int argc, char *argv[]){

  FLOAT *x;
  FLOAT result;
  blasint m, i;
-  blasint inc_x = 1;
+  blasint inc_x=1;
  int loops = 1;
  int l;
  char *p;

-  int from = 1;
-  int to = 200;
-  int step = 1;
-  double time1, timeg;
+  int from =   1;
+  int to   = 200;
+  int step =   1;

-  argc--;
-  argv++;
+  struct timeval start, stop;
+  double time1,timeg;

-  if (argc > 0)
-  {
-    from = atol(*argv);
-    argc--;
-    argv++;
-  }
-  if (argc > 0)
-  {
-    to = MAX(atol(*argv), from);
-    argc--;
-    argv++;
-  }
-  if (argc > 0)
-  {
-    step = atol(*argv);
-    argc--;
-    argv++;
+  argc--;argv++;
+
+  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
+  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
+  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
+
+  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
+  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
+
+  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Loops = %d\n", from, to, step,inc_x,loops);
+
+  if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
+    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-  if ((p = getenv("OPENBLAS_LOOPS")))
-    loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))
-    inc_x = atoi(p);

-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Loops = %d\n", from, to, step, inc_x, loops);
-
-  if ((x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL)
-  {
-    fprintf(stderr, "Out of Memory!!\n");
-    exit(1);
-  }
-
-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

  fprintf(stderr, "   SIZE       Flops\n");

-  for (m = from; m <= to; m += step)
+  for(m = from; m <= to; m += step)
  {

-    timeg = 0;
+   timeg=0;

-    fprintf(stderr, " %6d : ", (int)m);
+   fprintf(stderr, " %6d : ", (int)m);

-    for (l = 0; l < loops; l++)
-    {

-      for (i = 0; i < m * COMPSIZE * abs(inc_x); i++)
-      {
-        x[i] = ((FLOAT)rand() / (FLOAT)RAND_MAX) - 0.5;
-      }
-      begin();
-      result = ASUM(&m, x, &inc_x);
-      end();
-      timeg += getsec();
+   for (l=0; l<loops; l++)
+   {
+
+   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
+			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+   	}
+
+    	gettimeofday( &start, (struct timezone *)0);
+
+    	result = ASUM (&m, x, &inc_x);
+
+    	gettimeofday( &stop, (struct timezone *)0);
+
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
+	timeg += time1;
+
    }
-    if (loops > 1)
-      timeg /= loops;
+
+    timeg /= loops;

 #ifdef COMPLEX
    fprintf(stderr, " %10.2f MFlops %10.6f sec\n", 4. * (double)m / timeg * 1.e-6, timeg);
 #else
    fprintf(stderr, " %10.2f MFlops %10.6f sec\n", 2. * (double)m / timeg * 1.e-6, timeg);
 #endif
+
  }

  return 0;
--- a/benchmark/axpby.c
+++ b/benchmark/axpby.c
@@ -1,124 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef AXPBY
-
-#ifdef COMPLEX
-#ifdef DOUBLE
-#define AXPBY   BLASFUNC(zaxpby)
-#else
-#define AXPBY   BLASFUNC(caxpby)
-#endif
-#else
-#ifdef DOUBLE
-#define AXPBY   BLASFUNC(daxpby)
-#else
-#define AXPBY   BLASFUNC(saxpby)
-#endif
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *x, *y;
-  FLOAT alpha[2] = { 2.0, 2.0 };
-  FLOAT beta[2] = {2.0, 2.0};
-  blasint m, i;
-  blasint inc_x=1,inc_y=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);       argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);    argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);       argc--; argv++;}
-
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-  if ((p = getenv("OPENBLAS_INCY")))   inc_y = atoi(p);
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Inc_y = %d Loops = %d\n", from, to, step,inc_x,inc_y,loops);
-
-  if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-  if (( y = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef __linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-
-    timeg=0;
-
-    fprintf(stderr, " %6d : ", (int)m);
-
-
-    for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-            x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-    }
-
-    for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
-            y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-    }
-
-    for (l=0; l<loops; l++)
-    {
-        begin();
-        AXPBY (&m, alpha, x, &inc_x, beta, y, &inc_y );
-        end();
-        timeg += getsec();
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr,
-        " %10.2f MFlops %10.6f sec\n",
-        (COMPSIZE * COMPSIZE * 4. - COMPSIZE) * (double)m / timeg * 1.e-6, timeg);
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/axpy.c
+++ b/benchmark/axpy.c
@@ -25,7 +25,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef AXPY

@@ -43,6 +49,71 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *x, *y;
@@ -56,6 +127,8 @@ int main(int argc, char *argv[]){
  int from =   1;
  int to   = 200;
  int step =   1;
+
+  struct timeval start, stop;
  double time1,timeg;

  argc--;argv++;
@@ -78,7 +151,7 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -102,13 +175,13 @@ int main(int argc, char *argv[]){
   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
 			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
   	}
-    	begin();
+    	gettimeofday( &start, (struct timezone *)0);

    	AXPY (&m, alpha, x, &inc_x, y, &inc_y );

-    	end();
+    	gettimeofday( &stop, (struct timezone *)0);

-    	time1 = getsec();
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

 	timeg += time1;

@@ -117,7 +190,7 @@ int main(int argc, char *argv[]){
    timeg /= loops;

    fprintf(stderr,
-	    " %10.2f MFlops %10.9f sec\n",
+	    " %10.2f MFlops %10.6f sec\n",
 	    COMPSIZE * COMPSIZE * 2. * (double)m / timeg * 1.e-6, timeg);

  }
--- a/benchmark/bench.h
+++ b/benchmark/bench.h
@@ -1,134 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#ifdef __CYGWIN32__
-#include <sys/time.h>
-#elif defined(__APPLE__)
-#include <mach/mach_time.h>
-#endif
-#include "common.h"
-
-#if defined(__WIN32__) || defined(__WIN64__)
-
-#ifndef DELTA_EPOCH_IN_MICROSECS
-#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
-#endif
-
-int gettimeofday(struct timeval *tv, void *tz){
-
-  FILETIME ft;
-  unsigned __int64 tmpres = 0;
-  static int tzflag;
-
-  if (NULL != tv)
-    {
-      GetSystemTimeAsFileTime(&ft);
-
-      tmpres |= ft.dwHighDateTime;
-      tmpres <<= 32;
-      tmpres |= ft.dwLowDateTime;
-
-      /*converting file time to unix epoch*/
-      tmpres /= 10;  /*convert into microseconds*/
-      tmpres -= DELTA_EPOCH_IN_MICROSECS;
-      tv->tv_sec = (long)(tmpres / 1000000UL);
-      tv->tv_usec = (long)(tmpres % 1000000UL);
-    }
-
-  return 0;
-}
-
-#endif
-
-#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
-
-static void *huge_malloc(BLASLONG size){
-  int shmid;
-  void *address;
-
-#ifndef SHM_HUGETLB
-#define SHM_HUGETLB 04000
-#endif
-
-  if ((shmid =shmget(IPC_PRIVATE,
-		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
-		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
-    printf( "Memory allocation failed(shmget).\n");
-    exit(1);
-  }
-
-  address = shmat(shmid, NULL, SHM_RND);
-
-  if ((BLASLONG)address == -1){
-    printf( "Memory allocation failed(shmat).\n");
-    exit(1);
-  }
-
-  shmctl(shmid, IPC_RMID, 0);
-
-  return address;
-}
-
-
-#define malloc huge_malloc
-
-#endif
-
-/* Benchmarks should allocate with cacheline (often 64 bytes) alignment
-   to avoid unreliable results. This technique, storing the allocated
-   pointer value just before the aligned memory, doesn't require
-   C11's aligned_alloc for compatibility with older compilers. */
-static void *aligned_alloc_cacheline(size_t n)
-{
-  void *p = malloc((size_t)(void *) + n + L1_DATA_LINESIZE - 1);
-  if (p) {
-    void **newp = (void **)
-      (((uintptr_t)p + L1_DATA_LINESIZE) & (uintptr_t)-L1_DATA_LINESIZE);
-    newp[-1] = p;
-    p = newp;
-  }
-  return p;
-}
-#define malloc aligned_alloc_cacheline
-#define free(p) free((p) ? ((void **)(p))[-1] : (p))
-
-#if defined(__WIN32__) || defined(__WIN64__) || !defined(_POSIX_TIMERS)
-  struct timeval start, stop;
-#elif defined(__APPLE__)
- mach_timebase_info_data_t info;
- uint64_t start = 0, stop = 0;
-#else
-  struct timespec start = { 0, 0 }, stop = { 0, 0 };
-#endif
-
-double getsec()
-{
-#if defined(__WIN32__) || defined(__WIN64__) || !defined(_POSIX_TIMERS)
-    return (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
-#elif defined(__APPLE__)
-    mach_timebase_info(&info);
-    return (double)(((stop - start) * info.numer)/info.denom) * 1.e-9;
-#else
-    return (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_nsec - start.tv_nsec)) * 1.e-9;
-#endif
-}
-
-void begin() {
-#if defined(__WIN32__) || defined(__WIN64__) || !defined(_POSIX_TIMERS)
-    gettimeofday( &start, (struct timezone *)0);
-#elif defined(__APPLE__)
-    start = clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
-#else
-    clock_gettime(CLOCK_REALTIME, &start);
-#endif
-}
-
-void end() {
-#if defined(__WIN32__) || defined(__WIN64__) || !defined(_POSIX_TIMERS)
-    gettimeofday( &stop, (struct timezone *)0);
-#elif defined(__APPLE__)
-    stop = clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
-#else
-    clock_gettime(CLOCK_REALTIME, &stop);
-#endif
-}
--- a/benchmark/cholesky.c
+++ b/benchmark/cholesky.c
@@ -36,7 +36,12 @@
 /* or implied, of The University of Texas at Austin.                 */
 /*********************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"

 double fabs(double);

@@ -66,6 +71,41 @@ double fabs(double);
 #endif
 #endif

+
+
+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+
 static __inline double getmflops(int ratio, int m, double secs){

  double mm = (double)m;
@@ -105,6 +145,7 @@ int main(int argc, char *argv[]){

  FLOAT maxerr;

+  struct timeval start, stop;
  double time1;

  argc--;argv++;
@@ -132,46 +173,46 @@ int main(int argc, char *argv[]){
 #ifndef COMPLEX
      if (uplos & 1) {
 	for (j = 0; j < m; j++) {
-	  for(i = 0; i < j; i++)     a[(long)i + (long)j * (long)m] = 0.;
-	                             a[(long)j + (long)j * (long)m] = ((double) rand() / (double) RAND_MAX) + 8.;
-	  for(i = j + 1; i < m; i++) a[(long)i + (long)j * (long)m] = ((double) rand() / (double) RAND_MAX) - 0.5;
+	  for(i = 0; i < j; i++)     a[i + j * m] = 0.;
+	                             a[j + j * m] = ((double) rand() / (double) RAND_MAX) + 8.;
+	  for(i = j + 1; i < m; i++) a[i + j * m] = ((double) rand() / (double) RAND_MAX) - 0.5;
 	}
      } else {
 	for (j = 0; j < m; j++) {
-	  for(i = 0; i < j; i++)     a[(long)i + (long)j * (long)m] = ((double) rand() / (double) RAND_MAX) - 0.5;
-	                             a[(long)j + (long)j * (long)m] = ((double) rand() / (double) RAND_MAX) + 8.;
-	  for(i = j + 1; i < m; i++) a[(long)i + (long)j * (long)m] = 0.;
+	  for(i = 0; i < j; i++)     a[i + j * m] = ((double) rand() / (double) RAND_MAX) - 0.5;
+	                             a[j + j * m] = ((double) rand() / (double) RAND_MAX) + 8.;
+	  for(i = j + 1; i < m; i++) a[i + j * m] = 0.;
 	}
      }
 #else
      if (uplos & 1) {
 	for (j = 0; j < m; j++) {
 	  for(i = 0; i < j; i++) {
-	    a[((long)i + (long)j * (long)m) * 2 + 0] = 0.;
-	    a[((long)i + (long)j * (long)m) * 2 + 1] = 0.;
+	    a[(i + j * m) * 2 + 0] = 0.;
+	    a[(i + j * m) * 2 + 1] = 0.;
 	  }

-	  a[((long)j + (long)j * (long)m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) + 8.;
-	  a[((long)j + (long)j * (long)m) * 2 + 1] = 0.;
+	  a[(j + j * m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) + 8.;
+	  a[(j + j * m) * 2 + 1] = 0.;

 	  for(i = j + 1; i < m; i++) {
-	    a[((long)i + (long)j * (long)m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) - 0.5;
-	    a[((long)i + (long)j * (long)m) * 2 + 1] = ((double) rand() / (double) RAND_MAX) - 0.5;
+	    a[(i + j * m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) - 0.5;
+	    a[(i + j * m) * 2 + 1] = ((double) rand() / (double) RAND_MAX) - 0.5;
 	  }
 	}
      } else {
 	for (j = 0; j < m; j++) {
 	  for(i = 0; i < j; i++) {
-	    a[((long)i + (long)j * (long)m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) - 0.5;
-	    a[((long)i + (long)j * (long)m) * 2 + 1] = ((double) rand() / (double) RAND_MAX) - 0.5;
+	    a[(i + j * m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) - 0.5;
+	    a[(i + j * m) * 2 + 1] = ((double) rand() / (double) RAND_MAX) - 0.5;
 	  }

-	  a[((long)j + (long)j * (long)m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) + 8.;
-	  a[((long)j + (long)j * (long)m) * 2 + 1] = 0.;
+	  a[(j + j * m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) + 8.;
+	  a[(j + j * m) * 2 + 1] = 0.;

 	  for(i = j + 1; i < m; i++) {
-	    a[((long)i + (long)j * (long)m) * 2 + 0] = 0.;
-	    a[((long)i + (long)j * (long)m) * 2 + 1] = 0.;
+	    a[(i + j * m) * 2 + 0] = 0.;
+	    a[(i + j * m) * 2 + 1] = 0.;
 	  }
 	}
      }
@@ -179,31 +220,29 @@ int main(int argc, char *argv[]){

      SYRK(uplo[uplos], trans[uplos], &m, &m, alpha, a, &m, beta, b, &m);

-      begin();
+      gettimeofday( &start, (struct timezone *)0);

      POTRF(uplo[uplos], &m, b, &m, &info);

-      end();
+      gettimeofday( &stop, (struct timezone *)0);

      if (info != 0) {
 	fprintf(stderr, "Info = %d\n", info);
 	exit(1);
      }

-     time1 = getsec();
+     time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

+      maxerr = 0.;

      if (!(uplos & 1)) {
 	for (j = 0; j < m; j++) {
 	  for(i = 0; i <= j; i++) {
 #ifndef COMPLEX
-	    if (maxerr < fabs(a[(long)i + (long)j * (long)m] - b[(long)i + (long)j * (long)m]))
-	        maxerr = fabs(a[(long)i + (long)j * (long)m] - b[(long)i + (long)j * (long)m]);
+	    if (maxerr < fabs(a[i + j * m] - b[i + j * m])) maxerr = fabs(a[i + j * m] - b[i + j * m]);
 #else
-	    if (maxerr < fabs(a[((long)i + (long)j * (long)m) * 2 + 0] - b[((long)i + (long)j * (long)m) * 2 + 0]))
-	        maxerr = fabs(a[((long)i + (long)j * (long)m) * 2 + 0] - b[((long)i + (long)j * (long)m) * 2 + 0]);
-	    if (maxerr < fabs(a[((long)i + (long)j * (long)m) * 2 + 1] - b[((long)i + (long)j * (long)m) * 2 + 1]))
-	        maxerr = fabs(a[((long)i + (long)j * (long)m) * 2 + 1] - b[((long)i + (long)j * (long)m) * 2 + 1]);
+	    if (maxerr < fabs(a[(i + j * m) * 2 + 0] - b[(i + j * m) * 2 + 0])) maxerr = fabs(a[(i + j * m) * 2 + 0] - b[(i + j * m) * 2 + 0]);
+	    if (maxerr < fabs(a[(i + j * m) * 2 + 1] - b[(i + j * m) * 2 + 1])) maxerr = fabs(a[(i + j * m) * 2 + 1] - b[(i + j * m) * 2 + 1]);
 #endif
 	  }
 	}
@@ -211,13 +250,10 @@ int main(int argc, char *argv[]){
 	for (j = 0; j < m; j++) {
 	  for(i = j; i < m; i++) {
 #ifndef COMPLEX
-	    if (maxerr < fabs(a[(long)i + (long)j * (long)m] - b[(long)i + (long)j * (long)m]))
-	        maxerr = fabs(a[(long)i + (long)j * (long)m] - b[(long)i + (long)j * (long)m]);
+	    if (maxerr < fabs(a[i + j * m] - b[i + j * m])) maxerr = fabs(a[i + j * m] - b[i + j * m]);
 #else
-	    if (maxerr < fabs(a[((long)i + (long)j * (long)m) * 2 + 0] - b[((long)i + (long)j * (long)m) * 2 + 0]))
-	        maxerr = fabs(a[((long)i + (long)j * (long)m) * 2 + 0] - b[((long)i + (long)j * (long)m) * 2 + 0]);
-	    if (maxerr < fabs(a[((long)i + (long)j * (long)m) * 2 + 1] - b[((long)i + (long)j * (long)m) * 2 + 1]))
-	        maxerr = fabs(a[((long)i + (long)j * (long)m) * 2 + 1] - b[((long)i + (long)j * (long)m) * 2 + 1]);
+	    if (maxerr < fabs(a[(i + j * m) * 2 + 0] - b[(i + j * m) * 2 + 0])) maxerr = fabs(a[(i + j * m) * 2 + 0] - b[(i + j * m) * 2 + 0]);
+	    if (maxerr < fabs(a[(i + j * m) * 2 + 1] - b[(i + j * m) * 2 + 1])) maxerr = fabs(a[(i + j * m) * 2 + 1] - b[(i + j * m) * 2 + 1]);
 #endif
 	  }
 	}
--- a/benchmark/copy.c
+++ b/benchmark/copy.c
@@ -25,7 +25,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef COPY

@@ -43,6 +49,71 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *x, *y;
@@ -57,9 +128,8 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

-  double time1 = 0.0, timeg = 0.0;
-  long nanos = 0;
-  time_t seconds = 0;
+  struct timeval start, stop;
+  double time1,timeg;

  argc--;argv++;

@@ -81,7 +151,7 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -93,27 +163,35 @@ int main(int argc, char *argv[]){
   timeg=0;

   fprintf(stderr, " %6d : ", (int)m);
-   for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-       x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   }

-   for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
-       y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   }

   for (l=0; l<loops; l++)
   {
-       begin();
-       COPY (&m, x, &inc_x, y, &inc_y );
-       end();
-       timeg += getsec();
-   }

-      timeg /= loops;
+   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
+			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+   	}

-      fprintf(stderr,
-	    " %10.2f MBytes %12.9f sec\n",
-	    COMPSIZE * sizeof(FLOAT) * 1. * (double)m / timeg / 1.e6, timeg);
+   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
+			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+   	}
+    	gettimeofday( &start, (struct timezone *)0);
+
+    	COPY (&m, x, &inc_x, y, &inc_y );
+
+    	gettimeofday( &stop, (struct timezone *)0);
+
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
+	timeg += time1;
+
+    }
+
+    timeg /= loops;
+
+    fprintf(stderr,
+	    " %10.2f MBytes %10.6f sec\n",
+	    COMPSIZE * sizeof(FLOAT) * 1. * (double)m / timeg * 1.e-6, timeg);

  }

--- a/benchmark/dot.c
+++ b/benchmark/dot.c
@@ -25,16 +25,89 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef DOT

+
 #ifdef DOUBLE
 #define DOT   BLASFUNC(ddot)
 #else
 #define DOT   BLASFUNC(sdot)
 #endif

+
+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *x, *y;
@@ -49,6 +122,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1,timeg;

  argc--;argv++;
@@ -71,7 +145,7 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -95,12 +169,15 @@ int main(int argc, char *argv[]){
   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
 			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
   	}
-    	begin();
+    	gettimeofday( &start, (struct timezone *)0);

    	result = DOT (&m, x, &inc_x, y, &inc_y );

-    	end();
-	    timeg += getsec();
+    	gettimeofday( &stop, (struct timezone *)0);
+
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
+	timeg += time1;

    }

--- a/benchmark/geev.c
+++ b/benchmark/geev.c
@@ -36,7 +36,13 @@
 /* or implied, of The University of Texas at Austin.                 */
 /*********************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef GEEV

@@ -68,6 +74,71 @@ extern void GEEV( char* jobvl, char* jobvr, blasint* n, FLOAT* a,
                FLOAT* vr, blasint* ldvr, FLOAT* work, blasint* lwork, FLOAT *rwork, blasint* info );
 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a,*vl,*vr,*wi,*wr,*work,*rwork;
@@ -83,6 +154,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1;

  argc--;argv++;
@@ -123,7 +195,7 @@ int main(int argc, char *argv[]){

    for(j = 0; j < to; j++){
      for(i = 0; i < to * COMPSIZE; i++){
-	a[(long)i + (long)j * (long)to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	a[i + j * to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      }
    }

@@ -142,7 +214,7 @@ int main(int argc, char *argv[]){
  }


-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -151,7 +223,7 @@ int main(int argc, char *argv[]){
  for(m = from; m <= to; m += step){

    fprintf(stderr, " %6d : ", (int)m);
-    begin();
+    gettimeofday( &start, (struct timezone *)0);

    lwork = -1;
 #ifndef COMPLEX
@@ -167,14 +239,14 @@ int main(int argc, char *argv[]){
    GEEV (&job, &jobr, &m, a, &m, wr, vl, &m, vr, &m, work, &lwork,rwork, &info);
 #endif

-    end();
+    gettimeofday( &stop, (struct timezone *)0);

    if (info) {
      fprintf(stderr, "failed to compute eigenvalues .. %d\n", info);
      exit(1);
    }

-    time1 = getsec();
+    time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

    fprintf(stderr,
 	    " %10.2f MFlops : %10.2f Sec : %d\n",
--- a/benchmark/gemm.c
+++ b/benchmark/gemm.c
@@ -25,7 +25,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef GEMM

@@ -33,8 +39,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #ifdef DOUBLE
 #define GEMM   BLASFUNC(dgemm)
-#elif defined(HALF)
-#define GEMM   BLASFUNC(sbgemm)
 #else
 #define GEMM   BLASFUNC(sgemm)
 #endif
@@ -49,127 +53,168 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

-  IFLOAT *a, *b;
-  FLOAT *c;
-  FLOAT alpha[] = {1.0, 0.0};
+  FLOAT *a, *b, *c;
+  FLOAT alpha[] = {1.0, 1.0};
  FLOAT beta [] = {0.0, 0.0};
-  char transa = 'N';
-  char transb = 'N';
-  blasint m, n, k, i, j, lda, ldb, ldc;
+  char trans='N';
+  blasint m, n, i, j;
  int loops = 1;
-  int has_param_m = 0;
-  int has_param_n = 0;
-  int has_param_k = 0;
+  int has_param_n=0;
+  int l;
  char *p;

  int from =   1;
  int to   = 200;
  int step =   1;

-  double time1, timeg;
+  struct timeval start, stop;
+  double time1,timeg;

  argc--;argv++;

-  if (argc > 0) { from = atol(*argv);            argc--; argv++; }
-  if (argc > 0) { to   = MAX(atol(*argv), from); argc--; argv++; }
-  if (argc > 0) { step = atol(*argv);            argc--; argv++; }
+  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
+  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
+  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}

-  if ((p = getenv("OPENBLAS_TRANS"))) {
-    transa=*p;
-    transb=*p;
-  }
-  if ((p = getenv("OPENBLAS_TRANSA"))) {
-    transa=*p;
-  }
-  if ((p = getenv("OPENBLAS_TRANSB"))) {
-    transb=*p;
-  }
-  TOUPPER(transa);
-  TOUPPER(transb);
+  if ((p = getenv("OPENBLAS_TRANS")))  trans=*p;

-  fprintf(stderr, "From : %3d  To : %3d Step=%d : Transa=%c : Transb=%c\n", from, to, step, transa, transb);
+  fprintf(stderr, "From : %3d  To : %3d Step=%d : Trans=%c\n", from, to, step, trans);
+
+  if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
+    fprintf(stderr,"Out of Memory!!\n");exit(1);
+  }
+
+  if (( b = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
+    fprintf(stderr,"Out of Memory!!\n");exit(1);
+  }
+
+  if (( c = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
+    fprintf(stderr,"Out of Memory!!\n");exit(1);
+  }

  p = getenv("OPENBLAS_LOOPS");
-  if ( p != NULL ) {
-    loops = atoi(p);
-  }
+  if ( p != NULL )
+	loops = atoi(p);

-  if ((p = getenv("OPENBLAS_PARAM_M"))) {
-    m = atoi(p);
-    has_param_m=1;
-  } else {
-    m = to;
-  }
  if ((p = getenv("OPENBLAS_PARAM_N"))) {
-    n = atoi(p);
-    has_param_n=1;
-  } else {
-    n = to;
-  }
-  if ((p = getenv("OPENBLAS_PARAM_K"))) {
-    k = atoi(p);
-    has_param_k=1;
-  } else {
-    k = to;
+          n = atoi(p);
+	  has_param_n=1;	  
  }

-  if (( a = (IFLOAT *)malloc(sizeof(IFLOAT) * m * k * COMPSIZE)) == NULL) {
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-  if (( b = (IFLOAT *)malloc(sizeof(IFLOAT) * k * n * COMPSIZE)) == NULL) {
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-  if (( c = (FLOAT *)malloc(sizeof(FLOAT) * m * n * COMPSIZE)) == NULL) {
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif
+ 
+	for(j = 0; j < to; j++){
+      		for(i = 0; i < to * COMPSIZE; i++){
+			a[i + j * to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+			b[i + j * to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+			c[i + j * to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+      		}
+    	}

-  for (i = 0; i < m * k * COMPSIZE; i++) {
-    a[i] = ((IFLOAT) rand() / (IFLOAT) RAND_MAX) - 0.5;
-  }
-  for (i = 0; i < k * n * COMPSIZE; i++) {
-    b[i] = ((IFLOAT) rand() / (IFLOAT) RAND_MAX) - 0.5;
-  }
-  for (i = 0; i < m * n * COMPSIZE; i++) {
-    c[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-  }

-  fprintf(stderr, "          SIZE                   Flops             Time\n");

-  for (i = from; i <= to; i += step) {
-    
+  fprintf(stderr, "   SIZE          Flops          Time\n");
+
+  for(m = from; m <= to; m += step)
+  {
+
    timeg=0;

-    if (!has_param_m) { m = i; }
-    if (!has_param_n) { n = i; }
-    if (!has_param_k) { k = i; }
+    if ( has_param_n == 1 && n <= m )
+    	n=n;
+    else
+    	n=m;
+
+
+
+    fprintf(stderr, " %6dx%d : ", (int)m, (int)n);
+    gettimeofday( &start, (struct timezone *)0);
+
+    for (l=0; l<loops; l++)
+    {
+
+    	GEMM (&trans, &trans, &m, &n, &m, alpha, a, &m, b, &m, beta, c, &m );

-    if (transa == 'N') { lda = m; }
-    else { lda = k; }
-    if (transb == 'N') { ldb = k; }
-    else { ldb = n; }
-    ldc = m;

-    fprintf(stderr, " M=%4d, N=%4d, K=%4d : ", (int)m, (int)n, (int)k);
-    begin();

-    for (j=0; j<loops; j++) {
-      GEMM (&transa, &transb, &m, &n, &k, alpha, a, &lda, b, &ldb, beta, c, &ldc);
    }
-
-    end();
-    time1 = getsec();
+   gettimeofday( &stop, (struct timezone *)0);
+   time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

    timeg = time1/loops;
    fprintf(stderr,
 	    " %10.2f MFlops %10.6f sec\n",
-	    COMPSIZE * COMPSIZE * 2. * (double)k * (double)m * (double)n / timeg * 1.e-6, time1);
-    
+	    COMPSIZE * COMPSIZE * 2. * (double)m * (double)m * (double)n / timeg * 1.e-6, time1);
+
  }

  return 0;
--- a/benchmark/gemm3m.c
+++ b/benchmark/gemm3m.c
@@ -25,7 +25,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef GEMM

@@ -47,6 +53,71 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *b, *c;
@@ -62,6 +133,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1,timeg;

  argc--;argv++;
@@ -91,7 +163,7 @@ int main(int argc, char *argv[]){
 	loops = atoi(p);


-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -109,18 +181,22 @@ int main(int argc, char *argv[]){
  
    	for(j = 0; j < m; j++){
      		for(i = 0; i < m * COMPSIZE; i++){
-			a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-			b[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-			c[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+			a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+			b[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+			c[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      		}
    	}

-    	begin();
+    	gettimeofday( &start, (struct timezone *)0);

    	GEMM (&trans, &trans, &m, &m, &m, alpha, a, &m, b, &m, beta, c, &m );

-    	end();
-	    timeg += getsec();
+    	gettimeofday( &stop, (struct timezone *)0);
+
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
+	timeg += time1;
+
    }

    timeg /= loops;
--- a/benchmark/gemv.c
+++ b/benchmark/gemv.c
@@ -25,7 +25,12 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"


 #undef GEMV
@@ -47,11 +52,77 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif

 #endif
+
+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *x, *y;
  FLOAT alpha[] = {1.0, 1.0};
-  FLOAT beta [] = {1.0, 0.0};
+  FLOAT beta [] = {1.0, 1.0};
  char trans='N';
  blasint m, i, j;
  blasint inc_x=1,inc_y=1;
@@ -66,6 +137,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1,timeg;

  argc--;argv++;
@@ -109,7 +181,7 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -125,7 +197,7 @@ int main(int argc, char *argv[]){
   		fprintf(stderr, " %6dx%d : ", (int)m,(int)n);
   		for(j = 0; j < m; j++){
      			for(i = 0; i < n * COMPSIZE; i++){
-				a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+				a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      			}
   		}

@@ -136,13 +208,13 @@ int main(int argc, char *argv[]){
 				x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
   			}

-   			for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
+   			for(i = 0; i < n * COMPSIZE * abs(inc_y); i++){
 				y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
   			}
-    			begin();
+    			gettimeofday( &start, (struct timezone *)0);
    			GEMV (&trans, &m, &n, alpha, a, &m, x, &inc_x, beta, y, &inc_y );
-    			end();
-    			time1 = getsec();
+    			gettimeofday( &stop, (struct timezone *)0);
+    			time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
 			timeg += time1;

    		}
@@ -162,7 +234,7 @@ int main(int argc, char *argv[]){
   		fprintf(stderr, " %6dx%d : ", (int)m,(int)n);
   		for(j = 0; j < m; j++){
      			for(i = 0; i < n * COMPSIZE; i++){
-				a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+				a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      			}
   		}

@@ -173,13 +245,13 @@ int main(int argc, char *argv[]){
 				x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
   			}

-   			for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
+   			for(i = 0; i < n * COMPSIZE * abs(inc_y); i++){
 				y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
   			}
-    			begin();
+    			gettimeofday( &start, (struct timezone *)0);
    			GEMV (&trans, &m, &n, alpha, a, &m, x, &inc_x, beta, y, &inc_y );
-    			end();
-    			time1 = getsec();
+    			gettimeofday( &stop, (struct timezone *)0);
+    			time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
 			timeg += time1;

    		}
--- a/benchmark/ger.c
+++ b/benchmark/ger.c
@@ -25,7 +25,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef GER

@@ -43,6 +49,72 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 #endif

+
+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *x, *y;
@@ -59,6 +131,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1,timeg;

  argc--;argv++;
@@ -92,7 +165,7 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -109,7 +182,7 @@ int main(int argc, char *argv[]){

   for(j = 0; j < m; j++){
      		for(i = 0; i < n * COMPSIZE; i++){
-			a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+			a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      		}
   }

@@ -125,13 +198,16 @@ int main(int argc, char *argv[]){
    for (l=0; l<loops; l++)
    {

-    	begin();
+    	gettimeofday( &start, (struct timezone *)0);

    	GER (&m, &n, alpha, x, &inc_x, y, &inc_y, a , &m);

-    	end();
-      
-      timeg += getsec();
+    	gettimeofday( &stop, (struct timezone *)0);
+
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
+	timeg += time1;
+
    }

    timeg /= loops;
--- a/benchmark/gesv.c
+++ b/benchmark/gesv.c
@@ -36,7 +36,12 @@
 /* or implied, of The University of Texas at Austin.                 */
 /*********************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"

 double fabs(double);

@@ -61,6 +66,71 @@ double fabs(double);
 #endif
 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *b;
@@ -72,6 +142,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1;

  argc--;argv++;
@@ -94,7 +165,7 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -106,35 +177,39 @@ int main(int argc, char *argv[]){

    for(j = 0; j < m; j++){
      for(i = 0; i < m * COMPSIZE; i++){
-	a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      }
    }

    for(j = 0; j < m; j++){
      for(i = 0; i < m * COMPSIZE; i++){
-	b[(long)i + (long)j * (long)m * COMPSIZE] = 0.0;
+	b[i + j * m * COMPSIZE] = 0.0;
      }
    }


    for (j = 0; j < m; ++j) {
      for (i = 0; i < m * COMPSIZE; ++i) {
-	b[i] += a[(long)i + (long)j * (long)m * COMPSIZE];
+	b[i] += a[i + j * m * COMPSIZE];
      }
    }

-    begin();
+    gettimeofday( &start, (struct timezone *)0);

    GESV (&m, &m, a, &m, ipiv, b, &m,  &info);

-    end();
+    gettimeofday( &stop, (struct timezone *)0);
+
+
+    time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+

-    time1 = getsec();

    fprintf(stderr,
 	    "%10.2f MFlops %10.6f s\n",
 	    COMPSIZE * COMPSIZE * (2. / 3. * (double)m * (double)m * (double)m + 2. * (double)m * (double)m * (double)m ) / (time1) * 1.e-6 , time1);

+
  }

  return 0;
--- a/benchmark/getri.c
+++ b/benchmark/getri.c
@@ -36,7 +36,12 @@
 /* or implied, of The University of Texas at Austin.                 */
 /*********************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"

 #undef GETRF
 #undef GETRI
@@ -67,22 +72,84 @@

 extern void GETRI(blasint *m, FLOAT *a, blasint *lda, blasint *ipiv, FLOAT *work, blasint *lwork, blasint *info);

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a,*work;
  FLOAT wkopt[4];
  blasint *ipiv;
-  blasint m, i, j, l, info,lwork;
+  blasint m, i, j, info,lwork;

  int from =   1;
  int to   = 200;
  int step =   1;
-  int loops =  1;

-  double time1,timeg;
-  
-  char *p;
-  char btest = 'I';
+  struct timeval start, stop;
+  double time1;

  argc--;argv++;

@@ -90,9 +157,6 @@ int main(int argc, char *argv[]){
  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}

-  if ((p = getenv("OPENBLAS_TEST"))) btest=*p;
-  
-  if ((p = getenv("OPENBLAS_LOOPS"))) loops=*p;

  fprintf(stderr, "From : %3d  To : %3d Step = %3d\n", from, to, step);

@@ -108,7 +172,7 @@ int main(int argc, char *argv[]){

    for(j = 0; j < to; j++){
      for(i = 0; i < to * COMPSIZE; i++){
-	a[(long)i + (long)j * (long)to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	a[i + j * to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      }
    }

@@ -124,48 +188,39 @@ int main(int argc, char *argv[]){
  }


-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

  fprintf(stderr, "   SIZE           FLops           Time          Lwork\n");

  for(m = from; m <= to; m += step){
-    timeg = 0.;
+
    fprintf(stderr, " %6d : ", (int)m);

-    for (l = 0; l < loops; l++) {
-
-    if (btest == 'F') begin();
    GETRF (&m, &m, a, &m, ipiv, &info);
-    if (btest == 'F') {
-      end();
-      timeg += getsec();
-    }
+
    if (info) {
      fprintf(stderr, "Matrix is not singular .. %d\n", info);
      exit(1);
    }

-    if (btest == 'I') begin();
+    gettimeofday( &start, (struct timezone *)0);

    lwork = -1;
    GETRI(&m, a, &m, ipiv, wkopt, &lwork, &info);

    lwork = (blasint)wkopt[0];
    GETRI(&m, a, &m, ipiv, work, &lwork, &info);
-    if (btest == 'I') end();
+    gettimeofday( &stop, (struct timezone *)0);

    if (info) {
      fprintf(stderr, "failed compute inverse matrix .. %d\n", info);
      exit(1);
    }

-    if (btest == 'I') 
-      timeg += getsec();
-    
-    } // loops
-    time1 = timeg/(double)loops;
+    time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
    fprintf(stderr,
 	    " %10.2f MFlops : %10.2f Sec : %d\n",
 	    COMPSIZE * COMPSIZE * (4.0/3.0 * (double)m * (double)m *(double)m - (double)m *(double)m + 5.0/3.0* (double)m) / time1 * 1.e-6,time1,lwork);
--- a/benchmark/hbmv.c
+++ b/benchmark/hbmv.c
@@ -1,134 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef HBMV
-
-#ifdef DOUBLE
-#define HBMV   BLASFUNC(zhbmv)
-#else
-#define HBMV   BLASFUNC(chbmv)
-#endif
-
-int main(int argc, char *argv[]){
-
-    FLOAT *a, *x, *y;
-    FLOAT alpha[] = {1.0, 1.0};
-    FLOAT beta [] = {0.0, 0.0};
-    blasint k = 1;
-    char uplo='L';
-    blasint m, i, j;
-    blasint inc_x=1, inc_y=1;
-    int loops = 1;
-    int l;
-    char *p;
-
-    int from =   1;
-    int to   = 200;
-    int step =   1;
-
-    double time1,timeg;
-
-    argc--;argv++;
-
-    if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-    if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-    if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-    if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-    if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-    if ((p = getenv("OPENBLAS_INCY")))   inc_y = atoi(p);
-    if ((p = getenv("OPENBLAS_UPLO")))   uplo=*p;
-    if ((p = getenv("OPENBLAS_K")))      k = atoi(p);
-    
-    fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = '%c' k = %d Inc_x = %d Inc_y = %d Loops = %d\n", 
-                            from, to, step, uplo, k, inc_x, inc_y, loops);
-
-    if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL) {
-        fprintf(stderr,"Out of Memory!!\n");
-        exit(1);
-    }
-
-    if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL) {
-        fprintf(stderr,"Out of Memory!!\n");
-        exit(1);
-    }
-
-    if (( y = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) == NULL) {
-        fprintf(stderr,"Out of Memory!!\n");
-        exit(1);
-    }
-
-#ifdef __linux
-    srandom(getpid());
-#endif
-
-    fprintf(stderr, "   SIZE       Flops\n");
-
-    for(m = from; m <= to; m += step) {
-
-        timeg=0;
-
-        fprintf(stderr, " %6dx%d : ", (int)m, (int)m);
-
-        for(j = 0; j < m; j++) {
-            for(i = 0; i < m * COMPSIZE; i++) {
-                a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-            }
-        }
-
-    for (l = 0; l < loops; l++) {
-
-        for (i = 0; i < m * COMPSIZE * abs(inc_x); i++) {
-            x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-        }
-
-        for (i = 0; i < m * COMPSIZE * abs(inc_y); i++) {
-            y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-        }
-
-        begin();
-
-        HBMV (&uplo, &m, &k, alpha, a, &m, x, &inc_x, beta, y, &inc_y );
-
-        end();
-
-        timeg += getsec();
-
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr, " %10.2f MFlops\n",
-            COMPSIZE * COMPSIZE * 2. * (double)(2 * k + 1) * (double)m / timeg * 1.e-6);
-    }
-
-    return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/hemm.c
+++ b/benchmark/hemm.c
@@ -25,7 +25,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef HEMM

@@ -35,6 +41,72 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define HEMM   BLASFUNC(chemm)
 #endif

+
+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *b, *c;
@@ -54,6 +126,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1;

  argc--;argv++;
@@ -78,7 +151,7 @@ int main(int argc, char *argv[]){



-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -91,19 +164,21 @@ int main(int argc, char *argv[]){

    for(j = 0; j < m; j++){
      for(i = 0; i < m * COMPSIZE; i++){
-	a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-	b[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-	c[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	b[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	c[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      }
    }

-    begin();
+    gettimeofday( &start, (struct timezone *)0);

    HEMM (&side, &uplo, &m, &m, alpha, a, &m, b, &m, beta, c, &m );

-    end();
+    gettimeofday( &stop, (struct timezone *)0);

-    time1 = getsec();
+    time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
+    gettimeofday( &start, (struct timezone *)0);

    fprintf(stderr,
 	    " %10.2f MFlops\n",
--- a/benchmark/hemv.c
+++ b/benchmark/hemv.c
@@ -25,16 +25,89 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef HEMV

+
 #ifdef DOUBLE
 #define HEMV   BLASFUNC(zhemv)
 #else
 #define HEMV   BLASFUNC(chemv)
 #endif

+
+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *x, *y;
@@ -51,6 +124,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1,timeg;

  argc--;argv++;
@@ -78,7 +152,7 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -93,7 +167,7 @@ int main(int argc, char *argv[]){

   for(j = 0; j < m; j++){
      		for(i = 0; i < m * COMPSIZE; i++){
-			a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+			a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      		}
   }

@@ -108,13 +182,13 @@ int main(int argc, char *argv[]){
   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
 			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
   	}
-    	begin();
+    	gettimeofday( &start, (struct timezone *)0);

    	HEMV (&uplo, &m, alpha, a, &m, x, &inc_x, beta, y, &inc_y );

-    	end();
+    	gettimeofday( &stop, (struct timezone *)0);

-    	time1 = getsec();
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

 	timeg += time1;

--- a/benchmark/her.c
+++ b/benchmark/her.c
@@ -1,109 +0,0 @@
-/***************************************************************************
-Copyright (c) 2020, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef HER
-
-#ifdef DOUBLE
-#define HER   BLASFUNC(zher)
-#else
-#define HER   BLASFUNC(cher)
-#endif
-
-int main(int argc, char *argv[]){
-
-    FLOAT *a, *x;
-    FLOAT alpha[] = {1.0, 1.0};
-    blasint incx = 1;
-    char *p;
-
-    char uplo='U';
-    char trans='N';
-
-    if ((p = getenv("OPENBLAS_UPLO"))) uplo=*p;
-    if ((p = getenv("OPENBLAS_TRANS"))) trans=*p;
-
-    blasint m, i, j;
-
-    int from =   1;
-    int to   = 200;
-    int step =   1;
-    double time1;
-
-    argc--;argv++;
-
-    if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-    if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-    if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-    fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = %c Trans = %c\n", from, to, step,uplo,trans);
-
-
-    if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
-        fprintf(stderr,"Out of Memory!!\n");exit(1);
-    }
-
-    if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * COMPSIZE)) == NULL){
-        fprintf(stderr,"Out of Memory!!\n");exit(1);
-    }
-
-
-
-#ifdef __linux
-    srandom(getpid());
-#endif
-
-    fprintf(stderr, "   SIZE       Flops\n");
-
-    for(m = from; m <= to; m += step)
-    {
-        fprintf(stderr, " %6d : ", (int)m);
-
-        for(j = 0; j < m; j++){
-            for(i = 0; i < m * COMPSIZE; i++){
-                a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-            }
-            x[ (long)j * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-        }
-
-        begin();
-
-        HER (&uplo, &m, alpha, x, &incx, a, &m );
-
-        end();
-
-        time1 = getsec();
-
-        fprintf(stderr,
-                " %10.2f MFlops\n",
-                COMPSIZE * COMPSIZE * 1. * (double)m * (double)m / time1 * 1.e-6);
-
-    }
-
-    return 0;
-}
--- a/benchmark/her2.c
+++ b/benchmark/her2.c
@@ -1,113 +0,0 @@
-/***************************************************************************
-Copyright (c) 2020, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef HER2
-
-#ifdef DOUBLE
-#define HER2   BLASFUNC(zher2)
-#else
-#define HER2   BLASFUNC(cher2)
-#endif
-
-int main(int argc, char *argv[]){
-
-    FLOAT *a, *x, *y;
-    FLOAT alpha[] = {1.0, 1.0};
-    blasint inc = 1;
-    char *p;
-
-    char uplo='U';
-    char trans='N';
-
-    if ((p = getenv("OPENBLAS_UPLO"))) uplo=*p;
-    if ((p = getenv("OPENBLAS_TRANS"))) trans=*p;
-
-    blasint m, i, j;
-
-    int from =   1;
-    int to   = 200;
-    int step =   1;
-
-    double time1;
-
-    argc--;argv++;
-
-    if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-    if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-    if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-    fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = %c Trans = %c\n", from, to, step,uplo,trans);
-
-
-    if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
-        fprintf(stderr,"Out of Memory!!\n");exit(1);
-    }
-
-    if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * COMPSIZE)) == NULL){
-        fprintf(stderr,"Out of Memory!!\n");exit(1);
-    }
-
-    if (( y = (FLOAT *)malloc(sizeof(FLOAT) * to * COMPSIZE)) == NULL){
-        fprintf(stderr,"Out of Memory!!\n");exit(1);
-    }
-
-#ifdef __linux
-    srandom(getpid());
-#endif
-
-    fprintf(stderr, "   SIZE       Flops\n");
-
-    for(m = from; m <= to; m += step)
-    {
-        fprintf(stderr, " %6d : ", (int)m);
-
-        for(j = 0; j < m; j++){
-            for(i = 0; i < m * COMPSIZE; i++){
-                a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-            }
-            x[ (long)j * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-            y[ (long)j * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-        }
-
-        begin();
-
-        HER2 (&uplo, &m, alpha, x, &inc, y, &inc, a, &m );
-
-        end();
-
-        time1 = getsec();
-
-        fprintf(stderr,
-                " %10.2f MFlops\n",
-                COMPSIZE * COMPSIZE * 2. * (double)m * (double)m / time1 * 1.e-6);
-
-    }
-
-    return 0;
-}
--- a/benchmark/her2k.c
+++ b/benchmark/her2k.c
@@ -25,7 +25,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef HER2K
 #ifdef DOUBLE
@@ -34,6 +40,72 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define HER2K   BLASFUNC(cher2k)
 #endif

+
+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *b, *c;
@@ -53,6 +125,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1;

  argc--;argv++;
@@ -77,7 +150,7 @@ int main(int argc, char *argv[]){



-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -90,19 +163,21 @@ int main(int argc, char *argv[]){

    for(j = 0; j < m; j++){
      for(i = 0; i < m * COMPSIZE; i++){
-	a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-	b[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-	c[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	b[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	c[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      }
    }

-    begin();
+    gettimeofday( &start, (struct timezone *)0);

    HER2K (&uplo, &trans, &m, &m, alpha, a, &m, b, &m, beta, c, &m );

-    end();
+    gettimeofday( &stop, (struct timezone *)0);

-    time1 = getsec();
+    time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
+    gettimeofday( &start, (struct timezone *)0);

    fprintf(stderr,
 	    " %10.2f MFlops\n",
--- a/benchmark/herk.c
+++ b/benchmark/herk.c
@@ -25,16 +25,89 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef HERK

+
 #ifdef DOUBLE
 #define HERK   BLASFUNC(zherk)
 #else
 #define HERK   BLASFUNC(cherk)
 #endif

+
+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *c;
@@ -54,6 +127,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1;

  argc--;argv++;
@@ -75,7 +149,7 @@ int main(int argc, char *argv[]){



-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -88,22 +162,25 @@ int main(int argc, char *argv[]){

    for(j = 0; j < m; j++){
      for(i = 0; i < m * COMPSIZE; i++){
-	a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-	c[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	c[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      }
    }

-    begin();
+    gettimeofday( &start, (struct timezone *)0);

    HERK (&uplo, &trans, &m, &m, alpha, a, &m, beta, c, &m );

-    end();
+    gettimeofday( &stop, (struct timezone *)0);

-    time1 = getsec();
+    time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
+    gettimeofday( &start, (struct timezone *)0);

    fprintf(stderr,
 	    " %10.2f MFlops\n",
 	    COMPSIZE * COMPSIZE * 1. * (double)m * (double)m * (double)m / time1 * 1.e-6);
+
  }

  return 0;
--- a/benchmark/hpmv.c
+++ b/benchmark/hpmv.c
@@ -1,133 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef HPMV
-
-#ifdef DOUBLE
-#define HPMV   BLASFUNC(zhpmv)
-#else
-#define HPMV   BLASFUNC(chpmv)
-#endif
-
-int main(int argc, char *argv[]){
-
-    FLOAT *a, *x, *y;
-    FLOAT alpha[] = {1.0, 1.0};
-    FLOAT beta [] = {1.0, 1.0};
-    char uplo='L';
-    blasint m, i, j;
-    blasint inc_x=1, inc_y=1;
-    int loops = 1;
-    int l;
-    char *p;
-
-    int from =   1;
-    int to   = 200;
-    int step =   1;
-
-    double time1,timeg;
-
-    argc--;argv++;
-
-    if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-    if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-    if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-    if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-    if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-    if ((p = getenv("OPENBLAS_INCY")))   inc_y = atoi(p);
-    if ((p = getenv("OPENBLAS_UPLO")))   uplo=*p;
-
-    fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = '%c' Inc_x = %d Inc_y = %d Loops = %d\n", from, to, step,uplo,inc_x,inc_y,loops);
-
-    if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL) {
-        fprintf(stderr,"Out of Memory!!\n");
-        exit(1);
-    }
-
-    if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL) {
-        fprintf(stderr,"Out of Memory!!\n");
-        exit(1);
-    }
-
-    if (( y = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) == NULL) {
-        fprintf(stderr,"Out of Memory!!\n");
-        exit(1);
-    }
-
-#ifdef __linux
-    srandom(getpid());
-#endif
-
-    fprintf(stderr, "   SIZE       Flops\n");
-
-    for(m = from; m <= to; m += step) {
-
-        timeg=0;
-
-        fprintf(stderr, " %6dx%d : ", (int)m, (int)m);
-
-        for(j = 0; j < m; j++) {
-            for(i = 0; i < m * COMPSIZE; i++) {
-                a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-            }
-        }
-
-    for (l = 0; l < loops; l++) {
-
-        for (i = 0; i < m * COMPSIZE * abs(inc_x); i++) {
-            x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-        }
-
-        for (i = 0; i < m * COMPSIZE * abs(inc_y); i++) {
-            y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-        }
-
-        begin();
-
-        HPMV (&uplo, &m, alpha, a, x, &inc_x, beta, y, &inc_y );
-
-        end();
-
-        time1 = getsec();
-
-        timeg += time1;
-
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr, " %10.2f MFlops\n",
-            COMPSIZE * COMPSIZE * 2. * (double)m * (double)m / timeg * 1.e-6);
-    }
-
-    return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/iamax.c
+++ b/benchmark/iamax.c
@@ -25,7 +25,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef IAMAX

@@ -43,6 +49,71 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *x;
@@ -56,6 +127,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1,timeg;

  argc--;argv++;
@@ -73,7 +145,7 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -94,13 +166,13 @@ int main(int argc, char *argv[]){
 			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
   	}

-    	begin();
+    	gettimeofday( &start, (struct timezone *)0);

    	IAMAX (&m, x, &inc_x);

-    	end();
+    	gettimeofday( &stop, (struct timezone *)0);

-    	time1 = getsec();
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

 	timeg += time1;

@@ -109,7 +181,7 @@ int main(int argc, char *argv[]){
    timeg /= loops;

    fprintf(stderr,
-	    " %10.2f MBytes %10.6f sec\n",
+	    " %10.2f MFlops %10.6f sec\n",
 	    COMPSIZE * sizeof(FLOAT) * 1. * (double)m / timeg * 1.e-6, timeg);

  }
--- a/benchmark/iamin.c
+++ b/benchmark/iamin.c
@@ -1,120 +0,0 @@
-/***************************************************************************
-Copyright (c) 2016, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef IAMIN
-
-#ifdef COMPLEX
-#ifdef DOUBLE
-#define IAMIN   BLASFUNC(izamin)
-#else
-#define IAMIN   BLASFUNC(icamin)
-#endif
-#else
-#ifdef DOUBLE
-#define IAMIN   BLASFUNC(idamin)
-#else
-#define IAMIN   BLASFUNC(isamin)
-#endif
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *x;
-  blasint m, i;
-  blasint inc_x=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Loops = %d\n", from, to, step,inc_x,loops);
-
-  if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef __linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-
-   timeg=0;
-
-   fprintf(stderr, " %6d : ", (int)m);
-
-
-   for (l=0; l<loops; l++)
-   {
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-
-    	begin();
-
-    	IAMIN (&m, x, &inc_x);
-
-    	end();
-
-    	time1 = getsec();
-
-	timeg += time1;
-
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr,
-	    " %10.2f MFlops %10.6f sec\n",
-	    COMPSIZE * sizeof(FLOAT) * 1. * (double)m / timeg * 1.e-6, timeg);
-
-  }
-  
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/imax.c
+++ b/benchmark/imax.c
@@ -1,114 +0,0 @@
-/***************************************************************************
-Copyright (c) 2016, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef IMAX
-
-#ifndef COMPLEX
-#ifdef DOUBLE
-#define IMAX   BLASFUNC(idmax)
-#else
-#define IMAX   BLASFUNC(ismax)
-#endif
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *x;
-  blasint m, i;
-  blasint inc_x=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Loops = %d\n", from, to, step,inc_x,loops);
-
-  if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef __linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-
-   timeg=0;
-
-   fprintf(stderr, " %6d : ", (int)m);
-
-
-   for (l=0; l<loops; l++)
-   {
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-
-    	begin();
-
-    	IMAX (&m, x, &inc_x);
-
-    	end();
-
-    	time1 = getsec();
-
-	timeg += time1;
-
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr,
-	    " %10.2f MFlops %10.6f sec\n",
-	    COMPSIZE * sizeof(FLOAT) * 1. * (double)m / timeg * 1.e-6, timeg);
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/imin.c
+++ b/benchmark/imin.c
@@ -1,114 +0,0 @@
-/***************************************************************************
-Copyright (c) 2016, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef IMIN
-
-#ifndef COMPLEX
-#ifdef DOUBLE
-#define IMIN   BLASFUNC(idmin)
-#else
-#define IMIN   BLASFUNC(ismin)
-#endif
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *x;
-  blasint m, i;
-  blasint inc_x=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Loops = %d\n", from, to, step,inc_x,loops);
-
-  if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef __linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-
-   timeg=0;
-
-   fprintf(stderr, " %6d : ", (int)m);
-
-
-   for (l=0; l<loops; l++)
-   {
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-
-    	begin();
-
-    	IMIN (&m, x, &inc_x);
-
-    	end();
-
-    	time1 = getsec();
-
-	timeg += time1;
-
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr,
-	    " %10.2f MFlops %10.6f sec\n",
-	    COMPSIZE * sizeof(FLOAT) * 1. * (double)m / timeg * 1.e-6, timeg);
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/linpack.c
+++ b/benchmark/linpack.c
@@ -36,7 +36,12 @@
 /* or implied, of The University of Texas at Austin.                 */
 /*********************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"

 double fabs(double);

@@ -67,26 +72,88 @@ double fabs(double);
 #endif
 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *b;
  blasint *ipiv;

-  blasint m, i, j, l, info;
+  blasint m, i, j, info;
  blasint unit =   1;

  int from =   1;
  int to   = 200;
  int step =   1;
-  int loops =  1;

  FLOAT maxerr;

-  double time1, time2, timeg1,timeg2;
+  struct timeval start, stop;
+  double time1, time2;

-  char *p;
-  if ((p = getenv("OPENBLAS_LOOPS"))) loops=*p;
-  
  argc--;argv++;

  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
@@ -107,19 +174,19 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

  fprintf(stderr, "   SIZE       Residual     Decompose            Solve           Total\n");

  for(m = from; m <= to; m += step){
-    timeg1 = timeg2 = 0.;
+
    fprintf(stderr, " %6d : ", (int)m);
-    for (l = 0; l < loops; l++) {
+
    for(j = 0; j < m; j++){
      for(i = 0; i < m * COMPSIZE; i++){
-	a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      }
    }

@@ -127,38 +194,36 @@ int main(int argc, char *argv[]){

    for (j = 0; j < m; ++j) {
      for (i = 0; i < m * COMPSIZE; ++i) {
-	b[i] += a[(long)i + (long)j * (long)m * COMPSIZE];
+	b[i] += a[i + j * m * COMPSIZE];
      }
    }

-    begin();
+    gettimeofday( &start, (struct timezone *)0);

    GETRF (&m, &m, a, &m, ipiv, &info);

-    end();
+    gettimeofday( &stop, (struct timezone *)0);

    if (info) {
      fprintf(stderr, "Matrix is not singular .. %d\n", info);
      exit(1);
    }

-    timeg1 += getsec();
+    time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

-    begin();
+    gettimeofday( &start, (struct timezone *)0);

    GETRS("N", &m, &unit, a, &m, ipiv, b, &m, &info);

-    end();
+    gettimeofday( &stop, (struct timezone *)0);

    if (info) {
      fprintf(stderr, "Matrix is not singular .. %d\n", info);
      exit(1);
    }

-    timeg2 += getsec();
-    } //loops
-    time1=timeg1/(double)loops;
-    time2=timeg2/(double)loops;
+    time2 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
    maxerr = 0.;

    for(i = 0; i < m; i++){
--- a/benchmark/max.c
+++ b/benchmark/max.c
@@ -1,113 +0,0 @@
-/***************************************************************************
-Copyright (c) 2016, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef NAMAX
-
-#ifndef COMPLEX
-#ifdef DOUBLE
-#define NAMAX   BLASFUNC(dmax)
-#else
-#define NAMAX   BLASFUNC(smax)
-#endif
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *x;
-  blasint m, i;
-  blasint inc_x=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Loops = %d\n", from, to, step,inc_x,loops);
-
-  if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef __linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-
-   timeg=0;
-
-   fprintf(stderr, " %6d : ", (int)m);
-
-
-   for (l=0; l<loops; l++)
-   {
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-
-    	begin();
-
-    	NAMAX (&m, x, &inc_x);
-
-    	end();
-
-    	time1 = getsec();
-
-	timeg += time1;
-
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr,
-	    " %10.2f MFlops %10.6f sec\n",
-	    COMPSIZE * sizeof(FLOAT) * 1. * (double)m / timeg * 1.e-6, timeg);
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/min.c
+++ b/benchmark/min.c
@@ -1,113 +0,0 @@
-/***************************************************************************
-Copyright (c) 2016, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef NAMIN
-
-#ifndef COMPLEX
-#ifdef DOUBLE
-#define NAMIN   BLASFUNC(dmin)
-#else
-#define NAMIN   BLASFUNC(smin)
-#endif
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *x;
-  blasint m, i;
-  blasint inc_x=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Loops = %d\n", from, to, step,inc_x,loops);
-
-  if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef __linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-
-   timeg=0;
-
-   fprintf(stderr, " %6d : ", (int)m);
-
-
-   for (l=0; l<loops; l++)
-   {
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-
-    	begin();
-
-    	NAMIN (&m, x, &inc_x);
-
-    	end();
-
-    	time1 = getsec();
-
-	timeg += time1;
-
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr,
-	    " %10.2f MFlops %10.6f sec\n",
-	    COMPSIZE * sizeof(FLOAT) * 1. * (double)m / timeg * 1.e-6, timeg);
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/nrm2.c
+++ b/benchmark/nrm2.c
@@ -25,7 +25,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef NRM2

@@ -43,6 +49,71 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *x;
@@ -56,6 +127,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1,timeg;

  argc--;argv++;
@@ -73,7 +145,7 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -94,13 +166,13 @@ int main(int argc, char *argv[]){
 			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
   	}

-    	begin();
+    	gettimeofday( &start, (struct timezone *)0);

    	NRM2 (&m, x, &inc_x);

-    	end();
+    	gettimeofday( &stop, (struct timezone *)0);

-    	time1 = getsec();
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

 	timeg += time1;

--- a/benchmark/potrf.c
+++ b/benchmark/potrf.c
@@ -36,7 +36,12 @@
 /* or implied, of The University of Texas at Austin.                 */
 /*********************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"

 double fabs(double);

@@ -81,7 +86,37 @@ double fabs(double);
 // extern void POTRI(char *uplo, blasint *m, FLOAT *a, blasint *lda, blasint *info);
 // extern void POTRS(char *uplo, blasint *m, blasint *n, FLOAT *a, blasint *lda, FLOAT *b, blasint *ldb, blasint *info);

+#if defined(__WIN32__) || defined(__WIN64__)

+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif

 int main(int argc, char *argv[]){

@@ -99,15 +134,15 @@ int main(int argc, char *argv[]){
  char *p;
  char btest = 'F';

-  blasint m, i, j, l, info, uplos=0;
-  double flops = 0.;
+  blasint m, i, j, info, uplos=0;
+  double flops;

  int from =   1;
  int to   = 200;
  int step =   1;
-  int loops =  1;

-  double time1, timeg;
+  struct timeval start, stop;
+  double time1;

  argc--;argv++;

@@ -120,8 +155,6 @@ int main(int argc, char *argv[]){

  if ((p = getenv("OPENBLAS_TEST"))) btest=*p;

-  if ((p = getenv("OPENBLAS_LOOPS"))) loops=*p;
-
  fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = %c\n", from, to, step,*uplo[uplos]);

  if (( a    = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
@@ -132,53 +165,51 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-
  for(m = from; m <= to; m += step){
-    timeg=0.;
-	  for (l = 0; l < loops; l++) {
+
 #ifndef COMPLEX
      if (uplos & 1) {
 	for (j = 0; j < m; j++) {
-	  for(i = 0; i < j; i++)     a[(long)i + (long)j * (long)m] = 0.;
-	  a[(long)j + (long)j * (long)m] = ((double) rand() / (double) RAND_MAX) + 8.;
-	  for(i = j + 1; i < m; i++) a[(long)i + (long)j * (long)m] = ((double) rand() / (double) RAND_MAX) - 0.5;
+	  for(i = 0; i < j; i++)     a[i + j * m] = 0.;
+	                             a[j + j * m] = ((double) rand() / (double) RAND_MAX) + 8.;
+	  for(i = j + 1; i < m; i++) a[i + j * m] = ((double) rand() / (double) RAND_MAX) - 0.5;
 	}
      } else {
 	for (j = 0; j < m; j++) {
-	  for(i = 0; i < j; i++)     a[(long)i + (long)j * (long)m] = ((double) rand() / (double) RAND_MAX) - 0.5;
-	  a[(long)j + (long)j * (long)m] = ((double) rand() / (double) RAND_MAX) + 8.;
-	  for(i = j + 1; i < m; i++) a[(long)i + (long)j * (long)m] = 0.;
+	  for(i = 0; i < j; i++)     a[i + j * m] = ((double) rand() / (double) RAND_MAX) - 0.5;
+	                             a[j + j * m] = ((double) rand() / (double) RAND_MAX) + 8.;
+	  for(i = j + 1; i < m; i++) a[i + j * m] = 0.;
 	}
      }
 #else
      if (uplos & 1) {
 	for (j = 0; j < m; j++) {
 	  for(i = 0; i < j; i++) {
-	    a[((long)i + (long)j * (long)m) * 2 + 0] = 0.;
-	    a[((long)i + (long)j * (long)m) * 2 + 1] = 0.;
+	    a[(i + j * m) * 2 + 0] = 0.;
+	    a[(i + j * m) * 2 + 1] = 0.;
 	  }

-	  a[((long)j + (long)j * (long)m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) + 8.;
-	  a[((long)j + (long)j * (long)m) * 2 + 1] = 0.;
+	  a[(j + j * m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) + 8.;
+	  a[(j + j * m) * 2 + 1] = 0.;

 	  for(i = j + 1; i < m; i++) {
-	    a[((long)i + (long)j * (long)m) * 2 + 0] = 0;
-	    a[((long)i + (long)j * (long)m) * 2 + 1] = ((double) rand() / (double) RAND_MAX) - 0.5;
+	    a[(i + j * m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) - 0.5;
+	    a[(i + j * m) * 2 + 1] = ((double) rand() / (double) RAND_MAX) - 0.5;
 	  }
 	}
      } else {
 	for (j = 0; j < m; j++) {
 	  for(i = 0; i < j; i++) {
-	    a[((long)i + (long)j * (long)m) * 2 + 0] = 0.;
-	    a[((long)i + (long)j * (long)m) * 2 + 1] = ((double) rand() / (double) RAND_MAX) - 0.5;
+	    a[(i + j * m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) - 0.5;
+	    a[(i + j * m) * 2 + 1] = ((double) rand() / (double) RAND_MAX) - 0.5;
 	  }

-	  a[((long)j + (long)j * (long)m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) + 8.;
-	  a[((long)j + (long)j * (long)m) * 2 + 1] = 0.;
+	  a[(j + j * m) * 2 + 0] = ((double) rand() / (double) RAND_MAX) + 8.;
+	  a[(j + j * m) * 2 + 1] = 0.;

 	  for(i = j + 1; i < m; i++) {
-	    a[((long)i + (long)j * (long)m) * 2 + 0] = 0.;
-	    a[((long)i + (long)j * (long)m) * 2 + 1] = 0.;
+	    a[(i + j * m) * 2 + 0] = 0.;
+	    a[(i + j * m) * 2 + 1] = 0.;
 	  }
 	}
      }
@@ -186,19 +217,19 @@ int main(int argc, char *argv[]){

      SYRK(uplo[uplos], trans[uplos], &m, &m, alpha, a, &m, beta, b, &m);

-      begin();
+      gettimeofday( &start, (struct timezone *)0);

      POTRF(uplo[uplos], &m, b, &m, &info);

-      end();
+      gettimeofday( &stop, (struct timezone *)0);

      if (info != 0) {
 	fprintf(stderr, "Potrf info = %d\n", info);
 	exit(1);
      }

-      if ( btest == 'F')
-	      timeg += getsec();
+      time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+      flops = COMPSIZE * COMPSIZE * (1.0/3.0 * (double)m * (double)m *(double)m +1.0/2.0* (double)m *(double)m + 1.0/6.0* (double)m) / time1 * 1.e-6;

      if ( btest == 'S' )
      {
@@ -209,43 +240,39 @@ int main(int argc, char *argv[]){
      		}
    	}

-      	begin();
+      	gettimeofday( &start, (struct timezone *)0);

      	POTRS(uplo[uplos], &m, &m, b, &m, a, &m,  &info);

-      	end();
+      	gettimeofday( &stop, (struct timezone *)0);

      	if (info != 0) {
 		fprintf(stderr, "Potrs info = %d\n", info);
 		exit(1);
        }
-        timeg += getsec();
+        time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+        flops = COMPSIZE * COMPSIZE * (2.0 * (double)m * (double)m *(double)m ) / time1 * 1.e-6;
+
      }
 	
      if ( btest == 'I' )
      {
 	
-      	begin();
+      	gettimeofday( &start, (struct timezone *)0);

      	POTRI(uplo[uplos], &m, b, &m, &info);

-      	end();
+      	gettimeofday( &stop, (struct timezone *)0);

      	if (info != 0) {
 		fprintf(stderr, "Potri info = %d\n", info);
 		exit(1);
        }
-        timeg += getsec();
-      }
-    } // loops

-      time1 = timeg/(double)loops;
-	if ( btest == 'F')
-		flops = COMPSIZE * COMPSIZE * (1.0/3.0 * (double)m * (double)m *(double)m +1.0/2.0* (double)m *(double)m + 1.0/6.0* (double)m) / time1 * 1.e-6;
-	if ( btest == 'S')
-		flops = COMPSIZE * COMPSIZE * (2.0 * (double)m * (double)m *(double)m ) / time1 * 1.e-6;
-	if ( btest == 'I')
-		flops = COMPSIZE * COMPSIZE * (2.0/3.0 * (double)m * (double)m *(double)m +1.0/2.0* (double)m *(double)m + 5.0/6.0* (double)m) / time1 * 1.e-6;
+        time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+        flops = COMPSIZE * COMPSIZE * (2.0/3.0 * (double)m * (double)m *(double)m +1.0/2.0* (double)m *(double)m + 5.0/6.0* (double)m) / time1 * 1.e-6;
+      }
+	
      fprintf(stderr, "%8d : %10.2f MFlops : %10.3f Sec : Test=%c\n",m,flops ,time1,btest);


--- a/benchmark/rot.c
+++ b/benchmark/rot.c
@@ -25,11 +25,16 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"

-#undef ROT

-#ifndef COMPLEX
+#undef DOT
+

 #ifdef DOUBLE
 #define ROT   BLASFUNC(drot)
@@ -37,14 +42,70 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define ROT   BLASFUNC(srot)
 #endif

-#else

-#ifdef DOUBLE
-#define ROT   BLASFUNC(zdrot)
-#else
-#define ROT   BLASFUNC(csrot)
+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
 #endif

+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
 #endif

 int main(int argc, char *argv[]){
@@ -63,6 +124,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1,timeg;

  argc--;argv++;
@@ -85,7 +147,7 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -98,31 +160,32 @@ int main(int argc, char *argv[]){

   fprintf(stderr, " %6d : ", (int)m);

-   for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-		x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   }
-
-   for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
-		y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   }

   for (l=0; l<loops; l++)
   {
-    	begin();
+
+   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
+			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+   	}
+
+   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
+			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+   	}
+    	gettimeofday( &start, (struct timezone *)0);

    	ROT (&m, x, &inc_x, y, &inc_y, c, s);

-    	end();
+    	gettimeofday( &stop, (struct timezone *)0);

-    	time1 = getsec();
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

-	    timeg += time1;
+	timeg += time1;

-   }
+    }

-   timeg /= loops;
+    timeg /= loops;

-   fprintf(stderr,
+    fprintf(stderr,
 	    " %10.2f MFlops %10.6f sec\n",
 	    COMPSIZE * COMPSIZE * 6. * (double)m / timeg * 1.e-6, timeg);

--- a/benchmark/rotm.c
+++ b/benchmark/rotm.c
@@ -1,138 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef ROTM
-
-#ifdef DOUBLE
-#define ROTM BLASFUNC(drotm)
-#else
-#define ROTM BLASFUNC(srotm)
-#endif
-
-int main(int argc, char *argv[])
-{
-
-    FLOAT *x, *y;
-    // FLOAT result;
-    blasint m, i;
-    blasint inc_x = 1, inc_y = 1;
-    FLOAT param[5] = {1, 2.0, 3.0, 4.0, 5.0};
-    int loops = 1;
-    int l;
-    char *p;
-
-    int from = 1;
-    int to = 200;
-    int step = 1;
-
-    
-    double time1, timeg;
-
-    argc--;
-    argv++;
-
-    if (argc > 0) {
-        from = atol(*argv);
-        argc--;
-        argv++;
-    }
-    if (argc > 0) {
-        to = MAX(atol(*argv), from);
-        argc--;
-        argv++;
-    }
-    if (argc > 0) {
-        step = atol(*argv);
-        argc--;
-        argv++;
-    }
-
-    if ((p = getenv("OPENBLAS_LOOPS")))
-        loops = atoi(p);
-    if ((p = getenv("OPENBLAS_INCX")))
-        inc_x = atoi(p);
-    if ((p = getenv("OPENBLAS_INCY")))
-        inc_y = atoi(p);
-
-    fprintf(
-        stderr,
-        "From : %3d  To : %3d Step = %3d Inc_x = %d Inc_y = %d Loops = %d\n",
-        from, to, step, inc_x, inc_y, loops);
-
-    if ((x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) ==
-        NULL) {
-        fprintf(stderr, "Out of Memory!!\n");
-        exit(1);
-    }
-
-    if ((y = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) ==
-        NULL) {
-        fprintf(stderr, "Out of Memory!!\n");
-        exit(1);
-    }
-
-#ifdef __linux
-    srandom(getpid());
-#endif
-
-    fprintf(stderr, "   SIZE       Flops\n");
-
-    for (m = from; m <= to; m += step) {
-
-        timeg = 0;
-
-        fprintf(stderr, " %6d : ", (int)m);
-        for (i = 0; i < m * COMPSIZE * abs(inc_x); i++) {
-            x[i] = ((FLOAT)rand() / (FLOAT)RAND_MAX) - 0.5;
-        }
-
-        for (i = 0; i < m * COMPSIZE * abs(inc_y); i++) {
-            y[i] = ((FLOAT)rand() / (FLOAT)RAND_MAX) - 0.5;
-        }
-
-        for (l = 0; l < loops; l++) {
-            begin();
-
-            ROTM(&m, x, &inc_x, y, &inc_y, param);
-
-            end();
-
-            time1 = getsec();
-
-            timeg += time1;
-        }
-
-        timeg /= loops;
-
-        fprintf(stderr, " %10.2f MFlops %10.6f sec\n",
-                COMPSIZE * COMPSIZE * 6. * (double)m / timeg * 1.e-6, timeg);
-    }
-
-    return 0;
-}
--- a/benchmark/scal.c
+++ b/benchmark/scal.c
@@ -25,7 +25,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef SCAL

@@ -43,9 +49,74 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

-  FLOAT *x;
+  FLOAT *x, *y;
  FLOAT alpha[2] = { 2.0, 2.0 };
  blasint m, i;
  blasint inc_x=1,inc_y=1;
@@ -57,6 +128,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1,timeg;

  argc--;argv++;
@@ -74,7 +146,11 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+  if (( y = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) == NULL){
+    fprintf(stderr,"Out of Memory!!\n");exit(1);
+  }
+
+#ifdef linux
  srandom(getpid());
 #endif

@@ -87,20 +163,30 @@ int main(int argc, char *argv[]){

   fprintf(stderr, " %6d : ", (int)m);

-   for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-	x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   }

-   begin();
   for (l=0; l<loops; l++)
   {
+
+   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
+			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+   	}
+
+   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
+			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+   	}
+    	gettimeofday( &start, (struct timezone *)0);
+
    	SCAL (&m, alpha, x, &inc_x);
-   }
-   end();

-   time1 = getsec();
+    	gettimeofday( &stop, (struct timezone *)0);

-   timeg = time1 / loops;
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
+	timeg += time1;
+
+    }
+
+    timeg /= loops;

 #ifdef COMPLEX
    fprintf(stderr, " %10.2f MFlops %10.6f sec\n", 6. * (double)m / timeg * 1.e-6, timeg);
--- a/benchmark/scripts/R/deig.R
+++ b/benchmark/scripts/R/deig.R
@@ -2,8 +2,6 @@

 argv <- commandArgs(trailingOnly = TRUE)

-if (!is.null(options("matprod")[[1]])) options(matprod = "blas")
-
 nfrom <- 128
 nto <- 2048
 nstep <- 128
@@ -21,6 +19,7 @@ if (length(argv) > 0) {
      loops <- as.numeric(argv[z])
    }
  }
+
 }

 p <- Sys.getenv("OPENBLAS_LOOPS")
@@ -28,21 +27,29 @@ if (p != "") {
  loops <- as.numeric(p)
 }

-cat(sprintf("From %.0f To %.0f Step=%.0f Loops=%.0f\n", nfrom, nto, nstep, loops))
+
+cat(sprintf(
+  "From %.0f To %.0f Step=%.0f Loops=%.0f\n",
+  nfrom,
+  nto,
+  nstep,
+  loops
+))
 cat(sprintf("      SIZE             Flops                   Time\n"))

 n <- nfrom
 while (n <= nto) {
-  A <- matrix(rnorm(n * n), nrow = n)
+  A <- matrix(rnorm(n * n), ncol = n, nrow = n)
  ev <- 0
  z <- system.time(for (l in 1:loops) {
    ev <- eigen(A)
  })

-  mflops <- (26.66 * n * n * n) * loops / (z[3] * 1e+06)
+  mflops <- (26.66 * n * n * n) * loops / (z[3] * 1.0e6)

  st <- sprintf("%.0fx%.0f :", n, n)
  cat(sprintf("%20s %10.2f MFlops %10.6f sec\n", st, mflops, z[3]))

  n <- n + nstep
+
 }
--- a/benchmark/scripts/R/dgemm.R
+++ b/benchmark/scripts/R/dgemm.R
@@ -2,8 +2,6 @@

 argv <- commandArgs(trailingOnly = TRUE)

-if (!is.null(options("matprod")[[1]])) options(matprod = "blas")
-
 nfrom <- 128
 nto <- 2048
 nstep <- 128
@@ -21,6 +19,7 @@ if (length(argv) > 0) {
      loops <- as.numeric(argv[z])
    }
  }
+
 }

 p <- Sys.getenv("OPENBLAS_LOOPS")
@@ -28,13 +27,26 @@ if (p != "") {
  loops <- as.numeric(p)
 }

-cat(sprintf("From %.0f To %.0f Step=%.0f Loops=%.0f\n", nfrom, nto, nstep, loops))
+
+cat(sprintf(
+  "From %.0f To %.0f Step=%.0f Loops=%.0f\n",
+  nfrom,
+  nto,
+  nstep,
+  loops
+))
 cat(sprintf("      SIZE             Flops                   Time\n"))

 n <- nfrom
 while (n <= nto) {
-  A <- matrix(runif(n * n), nrow = n)
-  B <- matrix(runif(n * n), nrow = n)
+  A <- matrix(runif(n * n),
+              ncol = n,
+              nrow = n,
+              byrow = TRUE)
+  B <- matrix(runif(n * n),
+              ncol = n,
+              nrow = n,
+              byrow = TRUE)
  C <- 1

  z <- system.time(for (l in 1:loops) {
@@ -42,10 +54,11 @@ while (n <= nto) {
    l <- l + 1
  })

-  mflops <- (2.0 * n * n * n) * loops / (z[3] * 1e+06)
+  mflops <- (2.0 * n * n * n) * loops / (z[3] * 1.0e6)

  st <- sprintf("%.0fx%.0f :", n, n)
  cat(sprintf("%20s %10.2f MFlops %10.6f sec\n", st, mflops, z[3]))

  n <- n + nstep
+
 }
--- a/benchmark/scripts/R/dsolve.R
+++ b/benchmark/scripts/R/dsolve.R
@@ -2,8 +2,6 @@

 argv <- commandArgs(trailingOnly = TRUE)

-if (!is.null(options("matprod")[[1]])) options(matprod = "blas")
-
 nfrom <- 128
 nto <- 2048
 nstep <- 128
@@ -21,6 +19,7 @@ if (length(argv) > 0) {
      loops <- as.numeric(argv[z])
    }
  }
+
 }

 p <- Sys.getenv("OPENBLAS_LOOPS")
@@ -28,22 +27,31 @@ if (p != "") {
  loops <- as.numeric(p)
 }

-cat(sprintf("From %.0f To %.0f Step=%.0f Loops=%.0f\n", nfrom, nto, nstep, loops))
+
+cat(sprintf(
+  "From %.0f To %.0f Step=%.0f Loops=%.0f\n",
+  nfrom,
+  nto,
+  nstep,
+  loops
+))
 cat(sprintf("      SIZE             Flops                   Time\n"))

 n <- nfrom
 while (n <= nto) {
-  A <- matrix(rnorm(n * n), nrow = n)
-  B <- matrix(rnorm(n * n), nrow = n)
+  A <- matrix(rnorm(n * n), ncol = n, nrow = n)
+  B <- matrix(rnorm(n * n), ncol = n, nrow = n)

  z <- system.time(for (l in 1:loops) {
    solve(A, B)
  })

-  mflops <- (8.0 / 3 * n * n * n) * loops / (z[3] * 1e+06)
+  mflops <-
+    (2.0 / 3.0 * n * n * n + 2.0 * n * n * n) * loops / (z[3] * 1.0e6)

  st <- sprintf("%.0fx%.0f :", n, n)
  cat(sprintf("%20s %10.2f MFlops %10.6f sec\n", st, mflops, z[3]))

  n <- n + nstep
+
 }
--- a/benchmark/spmv.c
+++ b/benchmark/spmv.c
@@ -1,146 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef SPMV
-
-#ifndef COMPLEX
-
-#ifdef DOUBLE
-#define SPMV   BLASFUNC(dspmv)
-#else
-#define SPMV   BLASFUNC(sspmv)
-#endif
-
-#else
-
-#ifdef DOUBLE
-#define SPMV   BLASFUNC(zspmv)
-#else
-#define SPMV   BLASFUNC(cspmv)
-#endif
-
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *a, *x, *y;
-  FLOAT alpha[] = {1.0, 1.0};
-  FLOAT beta [] = {1.0, 1.0};
-  char uplo='L';
-  blasint m, i, j;
-  blasint inc_x=1,inc_y=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-  if ((p = getenv("OPENBLAS_INCY")))   inc_y = atoi(p);
-  if ((p = getenv("OPENBLAS_UPLO")))  uplo=*p;
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = '%c' Inc_x = %d Inc_y = %d Loops = %d\n", from, to, step,uplo,inc_x,inc_y,loops);
-
-  if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-  if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-  if (( y = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef __linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-
-   timeg=0;
-
-   fprintf(stderr, " %6dx%d : ", (int)m,(int)m);
-
-   for(j = 0; j < m; j++){
-      		for(i = 0; i < m * COMPSIZE; i++){
-			a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-      		}
-   }
-
-
-    for (l=0; l<loops; l++)
-    {
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
-			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-    	begin();
-
-    	SPMV (&uplo, &m, alpha, a, x, &inc_x, beta, y, &inc_y );
-
-    	end();
-
-    	time1 = getsec();
-
-	timeg += time1;
-
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr,
-	    " %10.2f MFlops\n",
-	    COMPSIZE * COMPSIZE * 2. * (double)m * (double)m / timeg * 1.e-6);
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/spr.c
+++ b/benchmark/spr.c
@@ -1,124 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef SPR
-
-#ifdef DOUBLE
-#define SPR   BLASFUNC(dspr)
-#else
-#define SPR   BLASFUNC(sspr)
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *a,*c;
-  FLOAT alpha[] = {1.0, 1.0};
-  blasint inc_x=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  char uplo='U';
-
-  if ((p = getenv("OPENBLAS_UPLO"))) uplo=*p;
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-
-  blasint m, i, j;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = %c Inc_x = %d\n", from, to, step,uplo,inc_x);
-
-
-  if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-  if (( c = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef __linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops		Time\n");
-
-  for(m = from; m <= to; m += step)
-  {
-	timeg=0;
-	
-    fprintf(stderr, " %6d : ", (int)m);
-	
-	for (l=0; l<loops; l++)
-    {
-
-		for(j = 0; j < m; j++){
-		  for(i = 0; i < m * COMPSIZE; i++){
-			a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-		  }
-		}
-		for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-			c[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-		}
-
-		begin();
-
-		SPR (&uplo, &m, alpha, c, &inc_x, a);
-
-		end();
-
-		time1 = getsec();
-		
-		timeg += time1;
-   }
-	
-	timeg /= loops;
-	 
-    fprintf(stderr,
-	    " %10.2f MFlops %10.6f sec\n",
-	    COMPSIZE * COMPSIZE * 1. * (double)m * (double)m  / timeg * 1.e-6, timeg);
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/spr2.c
+++ b/benchmark/spr2.c
@@ -1,135 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-
-#undef SPR2
-
-#ifdef DOUBLE
-#define SPR2   BLASFUNC(dspr2)
-#else
-#define SPR2   BLASFUNC(sspr2)
-#endif
-
-
-int main(int argc, char *argv[]){
-
-  FLOAT *a,*b,*c;
-  FLOAT alpha[] = {1.0, 1.0};
-  blasint inc_x=1,inc_y=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  char uplo='U';
-
-  if ((p = getenv("OPENBLAS_UPLO"))) uplo=*p;
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-
-  blasint m, i, j;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = %c Inc_x = %d Inc_y = %d\n", from, to, step,uplo,inc_x,inc_y);
-
-
-  if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-  
-  if (( b = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-  if (( c = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef __linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops		Time\n");
-
-  for(m = from; m <= to; m += step)
-  {
-    timeg=0;
-	
-    fprintf(stderr, " %6d : ", (int)m);
-	
-	for (l=0; l<loops; l++)
-    {
-
-		for(j = 0; j < m; j++){
-		  for(i = 0; i < m * COMPSIZE; i++){
-			a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-		  }
-		}
-		
-		for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
-			b[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-		}
-		
-		for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-			c[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-		}
-
-		begin();
-
-		SPR2 (&uplo, &m, alpha, c, &inc_x, b, &inc_y, a);
-
-		end();
-
-		time1 = getsec();
-		
-		timeg += time1;
-   }
-	
-    timeg /= loops;
-	 
-    fprintf(stderr,
-	    " %10.2f MFlops %10.6f sec\n",
-	    COMPSIZE * COMPSIZE * 2. * (double)m * (double)m  / timeg * 1.e-6, timeg);
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/swap.c
+++ b/benchmark/swap.c
@@ -25,7 +25,12 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"


 #undef SWAP
@@ -44,6 +49,71 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *x, *y;
@@ -58,6 +128,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1,timeg;

  argc--;argv++;
@@ -80,7 +151,7 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -104,13 +175,13 @@ int main(int argc, char *argv[]){
   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
 			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
   	}
-    	begin();
+    	gettimeofday( &start, (struct timezone *)0);

    	SWAP (&m, x, &inc_x, y, &inc_y );

-    	end();
+    	gettimeofday( &stop, (struct timezone *)0);

-    	time1 = getsec();
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

 	timeg += time1;

--- a/benchmark/symm.c
+++ b/benchmark/symm.c
@@ -25,7 +25,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef SYMM

@@ -47,6 +53,71 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *b, *c;
@@ -66,6 +137,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1;

  argc--;argv++;
@@ -90,7 +162,7 @@ int main(int argc, char *argv[]){



-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -103,19 +175,21 @@ int main(int argc, char *argv[]){

    for(j = 0; j < m; j++){
      for(i = 0; i < m * COMPSIZE; i++){
-	a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-	b[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-	c[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	b[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	c[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      }
    }

-    begin();
+    gettimeofday( &start, (struct timezone *)0);

    SYMM (&side, &uplo, &m, &m, alpha, a, &m, b, &m, beta, c, &m );

-    end();
+    gettimeofday( &stop, (struct timezone *)0);

-    time1 = getsec();
+    time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
+    gettimeofday( &start, (struct timezone *)0);

    fprintf(stderr,
 	    " %10.2f MFlops\n",
--- a/benchmark/symv.c
+++ b/benchmark/symv.c
@@ -25,7 +25,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef SYMV

@@ -47,6 +53,71 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *x, *y;
@@ -63,6 +134,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1,timeg;

  argc--;argv++;
@@ -90,7 +162,7 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -105,7 +177,7 @@ int main(int argc, char *argv[]){

   for(j = 0; j < m; j++){
      		for(i = 0; i < m * COMPSIZE; i++){
-			a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+			a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      		}
   }

@@ -120,13 +192,13 @@ int main(int argc, char *argv[]){
   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
 			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
   	}
-    	begin();
+    	gettimeofday( &start, (struct timezone *)0);

    	SYMV (&uplo, &m, alpha, a, &m, x, &inc_x, beta, y, &inc_y );

-    	end();
+    	gettimeofday( &stop, (struct timezone *)0);

-    	time1 = getsec();
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

 	timeg += time1;

--- a/benchmark/syr.c
+++ b/benchmark/syr.c
@@ -1,113 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-
-#undef SYR
-
-#ifdef DOUBLE
-#define SYR   BLASFUNC(dsyr)
-#else
-#define SYR   BLASFUNC(ssyr)
-#endif
-
-
-int main(int argc, char *argv[]){
-
-  FLOAT *x,*a;
-  FLOAT alpha[] = {1.0, 1.0};
-  char *p;
-
-  char uplo='U';
-
-  if ((p = getenv("OPENBLAS_UPLO"))) uplo=*p;
-
-  blasint m, i, j;
-  blasint inc_x= 1;
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-  
-  double time1;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = %c Inc_x = %d\n", from, to, step,uplo,inc_x);
-
-
-  if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to *  COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-   if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef __linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-
-    fprintf(stderr, " %6d : ", (int)m);
-	
-	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-	x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-	
-    for(j = 0; j < m; j++){
-      for(i = 0; i < m * COMPSIZE; i++){
-	a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-      }
-    }
-
-    begin();
-
-    SYR (&uplo, &m, alpha, x, &inc_x, a, &m );
-
-    end();
-
-    time1 = getsec();
-
-    fprintf(stderr,
-	    " %10.2f MFlops\n",
-	    COMPSIZE * COMPSIZE * 1. * (double)m * (double)m / time1 * 1.e-6);
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/syr2.c
+++ b/benchmark/syr2.c
@@ -1,127 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef SYR2
-
-
-#ifdef DOUBLE
-#define SYR2   BLASFUNC(dsyr2)
-#else
-#define SYR2   BLASFUNC(ssyr2)
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *x, *y, *a;
-  FLOAT alpha[] = {1.0, 1.0};
-  char *p;
-
-  char uplo='U';
-
-  if ((p = getenv("OPENBLAS_UPLO"))) uplo=*p; 
-
-  blasint m, i, j, l;
-  blasint inc_x= 1;
-  blasint inc_y= 1;
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-  int loops =  1;
-
-  if ((p = getenv("OPENBLAS_LOOPS"))) loops=*p;
-
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = %c Inc_x = %d Inc_y = %d\n", from, to, step,uplo,inc_x,inc_y);
-
-  if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-   if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-  
-   if (( y = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-
-
-#ifdef __linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-    timeg = 0.;	
-    fprintf(stderr, " %6d : ", (int)m);
-    for (l = 0; l < loops; l++) {
-	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-	x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-	
-	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
-	y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-
-    for(j = 0; j < m; j++){
-      for(i = 0; i < m * COMPSIZE; i++){
-	a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-      }
-    }
-
-    begin();
-
-    SYR2 (&uplo, &m, alpha, x, &inc_x, y, &inc_y, a, &m );
-
-    end();
-
-    timeg += getsec();
-    } // loops
-
-    time1 = timeg/(double)loops;
-    fprintf(stderr,
-	    " %10.2f MFlops\n",
-	    COMPSIZE * COMPSIZE * 2. * (double)m * (double)m / time1 * 1.e-6);
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/syr2k.c
+++ b/benchmark/syr2k.c
@@ -25,7 +25,12 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"


 #undef SYR2K
@@ -48,6 +53,71 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *b, *c;
@@ -67,6 +137,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1;

  argc--;argv++;
@@ -91,7 +162,7 @@ int main(int argc, char *argv[]){



-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -104,19 +175,21 @@ int main(int argc, char *argv[]){

    for(j = 0; j < m; j++){
      for(i = 0; i < m * COMPSIZE; i++){
-	a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-	b[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-	c[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	b[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	c[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      }
    }

-    begin();
+    gettimeofday( &start, (struct timezone *)0);

    SYR2K (&uplo, &trans, &m, &m, alpha, a, &m, b, &m, beta, c, &m );

-    end();
+    gettimeofday( &stop, (struct timezone *)0);

-    time1 = getsec();
+    time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
+    gettimeofday( &start, (struct timezone *)0);

    fprintf(stderr,
 	    " %10.2f MFlops\n",
--- a/benchmark/syrk.c
+++ b/benchmark/syrk.c
@@ -1,5 +1,5 @@
 /***************************************************************************
-Copyright (c) 2014, 2023 The OpenBLAS Project
+Copyright (c) 2014, The OpenBLAS Project
 All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -25,7 +25,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef SYRK

@@ -47,6 +53,71 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *c;
@@ -56,20 +127,18 @@ int main(int argc, char *argv[]){

  char uplo='U';
  char trans='N';
-  
+
  if ((p = getenv("OPENBLAS_UPLO"))) uplo=*p;
  if ((p = getenv("OPENBLAS_TRANS"))) trans=*p;

-  blasint m, i, j, l;
+  blasint m, i, j;

  int from =   1;
  int to   = 200;
  int step =   1;
-  int loops =  1;

-  if ((p = getenv("OPENBLAS_LOOPS"))) loops=atoi(p);
-
-  double time1,timeg;
+  struct timeval start, stop;
+  double time1;

  argc--;argv++;

@@ -77,7 +146,7 @@ int main(int argc, char *argv[]){
  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}

-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = %c Trans = %c Loops = %d\n", from, to, step,uplo,trans,loops);
+  fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = %c Trans = %c\n", from, to, step,uplo,trans);


  if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
@@ -90,7 +159,7 @@ int main(int argc, char *argv[]){



-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -98,29 +167,26 @@ int main(int argc, char *argv[]){

  for(m = from; m <= to; m += step)
  {
-    timeg = 0.;

    fprintf(stderr, " %6d : ", (int)m);

-    for(l = 0; l < loops; l++) {
-
    for(j = 0; j < m; j++){
      for(i = 0; i < m * COMPSIZE; i++){
-	a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-	c[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	c[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      }
    }

-    begin();
+    gettimeofday( &start, (struct timezone *)0);

    SYRK (&uplo, &trans, &m, &m, alpha, a, &m, beta, c, &m );

-    end();
+    gettimeofday( &stop, (struct timezone *)0);
+
+    time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
+    gettimeofday( &start, (struct timezone *)0);

-    timeg += getsec();
-    
-    } //loops
-    time1 = timeg / (double)loops;
    fprintf(stderr,
 	    " %10.2f MFlops\n",
 	    COMPSIZE * COMPSIZE * 1. * (double)m * (double)m * (double)m / time1 * 1.e-6);
--- a/benchmark/tpmv.c
+++ b/benchmark/tpmv.c
@@ -1,132 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef TPMV
-
-#ifndef COMPLEX
-
-#ifdef DOUBLE
-#define TPMV   BLASFUNC(dtpmv)
-#else
-#define TPMV   BLASFUNC(stpmv)
-#endif
-
-#else
-
-#ifdef DOUBLE
-#define TPMV   BLASFUNC(ztpmv)
-#else
-#define TPMV   BLASFUNC(ctpmv)
-#endif
-
-#endif
-
-int main(int argc, char *argv[])
-{
-
-    FLOAT *a, *x;
-    char *p;
-
-    char uplo ='U';
-    char trans='N';
-    char diag ='U';
-
-    int loops = 1;
-    int l;
-    blasint inc_x=1;
-
-    if ((p = getenv("OPENBLAS_UPLO"))) uplo=*p;
-    if ((p = getenv("OPENBLAS_TRANS"))) trans=*p;
-    if ((p = getenv("OPENBLAS_DIAG"))) diag=*p;
-    if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-    if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-
-    blasint n, i, j;
-
-    int from =   1;
-    int to   = 200;
-    int step =   1;
-
-    double time1, timeg;
-
-    argc--;argv++;
-
-    if (argc > 0) { from     = atol(*argv);        argc--; argv++;}
-    if (argc > 0) { to       = MAX(atol(*argv), from);    argc--; argv++;}
-    if (argc > 0) { step     = atol(*argv);        argc--; argv++;}
-
-    fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = %c Trans = %c  Diag = %c Loops=%d Inc_x=%d\n", from,
-            to, step, uplo, trans, diag, loops, inc_x);
-
-    if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL) {
-        fprintf(stderr,"Out of Memory!!\n");exit(1);
-    }
-
-    if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-        fprintf(stderr,"Out of Memory!!\n");exit(1);
-    }
-
-#ifdef __linux
-    srandom(getpid());
-#endif
-
-    fprintf(stderr, "   SIZE       Flops\n");
-
-    for(n = from; n <= to; n += step) {
-        timeg=0;
-
-        fprintf(stderr, " %6d : ", (int)n);
-        for(j = 0; j < n; j++) {
-            for(i = 0; i < n * COMPSIZE; i++) {
-                a[(long)i + (long)j * (long)n * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-            }
-        }
-
-        for (i = 0; i < n * COMPSIZE * abs(inc_x); i++) {
-            x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-        }
-
-        for (l = 0; l < loops; l++) {
-            begin();
-            TPMV (&uplo, &trans, &diag, &n, a, x, &inc_x);
-            end();
-
-            time1 = getsec();
-            timeg += time1;
-        }
-
-        timeg /= loops;
-        fprintf(stderr, " %10.2f MFlops %12.9f sec\n",
-                COMPSIZE * COMPSIZE * 1. * (double)n * (double)n / timeg / 1.e6, timeg);
-    }
-
-    return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/tpsv.c
+++ b/benchmark/tpsv.c
@@ -1,132 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef TPSV
-
-#ifndef COMPLEX
-
-#ifdef DOUBLE
-#define TPSV   BLASFUNC(dtpsv)
-#else
-#define TPSV   BLASFUNC(stpsv)
-#endif
-
-#else
-
-#ifdef DOUBLE
-#define TPSV   BLASFUNC(ztpsv)
-#else
-#define TPSV   BLASFUNC(ctpsv)
-#endif
-
-#endif
-
-int main(int argc, char *argv[])
-{
-
-    FLOAT *a, *x;
-    char *p;
-
-    char uplo ='U';
-    char trans='N';
-    char diag ='U';
-
-    int loops = 1;
-    int l;
-    blasint inc_x=1;
-
-    if ((p = getenv("OPENBLAS_UPLO"))) uplo=*p;
-    if ((p = getenv("OPENBLAS_TRANS"))) trans=*p;
-    if ((p = getenv("OPENBLAS_DIAG"))) diag=*p;
-    if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-    if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-
-    blasint n, i, j;
-
-    int from =   1;
-    int to   = 200;
-    int step =   1;
-
-    double time1, timeg;
-
-    argc--;argv++;
-
-    if (argc > 0) { from     = atol(*argv);        argc--; argv++;}
-    if (argc > 0) { to       = MAX(atol(*argv), from);    argc--; argv++;}
-    if (argc > 0) { step     = atol(*argv);        argc--; argv++;}
-
-    fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = %c Trans = %c  Diag = %c Loops=%d Inc_x=%d\n", from,
-            to, step, uplo, trans, diag, loops, inc_x);
-
-    if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL) {
-        fprintf(stderr,"Out of Memory!!\n");exit(1);
-    }
-
-    if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-        fprintf(stderr,"Out of Memory!!\n");exit(1);
-    }
-
-#ifdef __linux
-    srandom(getpid());
-#endif
-
-    fprintf(stderr, "   SIZE       Flops\n");
-
-    for(n = from; n <= to; n += step) {
-        timeg=0;
-
-        fprintf(stderr, " %6d : ", (int)n);
-        for(j = 0; j < n; j++) {
-            for(i = 0; i < n * COMPSIZE; i++) {
-                a[(long)i + (long)j * (long)n * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-            }
-        }
-
-        for (i = 0; i < n * COMPSIZE * abs(inc_x); i++) {
-            x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-        }
-
-        for (l = 0; l < loops; l++) {
-            begin();
-            TPSV (&uplo, &trans, &diag, &n, a, x, &inc_x);
-            end();
-
-            time1 = getsec();
-            timeg += time1;
-        }
-
-        timeg /= loops;
-        fprintf(stderr, " %10.2f MFlops %12.9f sec\n",
-                COMPSIZE * COMPSIZE * 1. * (double)n * (double)n / timeg / 1.e6, timeg);
-    }
-
-    return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/trmm.c
+++ b/benchmark/trmm.c
@@ -25,7 +25,12 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"


 #undef TRMM
@@ -48,6 +53,71 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *b;
@@ -71,6 +141,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1;

  argc--;argv++;
@@ -91,7 +162,7 @@ int main(int argc, char *argv[]){



-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -104,18 +175,20 @@ int main(int argc, char *argv[]){

    for(j = 0; j < m; j++){
      for(i = 0; i < m * COMPSIZE; i++){
-	a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-	b[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	b[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      }
    }

-    begin();
+    gettimeofday( &start, (struct timezone *)0);

    TRMM (&side, &uplo, &trans, &diag, &m, &m, alpha, a, &m, b, &m);

-    end();
+    gettimeofday( &stop, (struct timezone *)0);

-    time1 = getsec();
+    time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
+    gettimeofday( &start, (struct timezone *)0);

    fprintf(stderr,
 	    " %10.2f MFlops  %10.6f sec\n",
--- a/benchmark/trmv.c
+++ b/benchmark/trmv.c
@@ -1,132 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef TRMV
-
-#ifndef COMPLEX
-
-#ifdef DOUBLE
-#define TRMV   BLASFUNC(dtrmv)
-#else
-#define TRMV   BLASFUNC(strmv)
-#endif
-
-#else
-
-#ifdef DOUBLE
-#define TRMV   BLASFUNC(ztrmv)
-#else
-#define TRMV   BLASFUNC(ctrmv)
-#endif
-
-#endif
-
-int main(int argc, char *argv[])
-{
-
-    FLOAT *a, *x;
-    char *p;
-
-    char uplo ='U';
-    char trans='N';
-    char diag ='U';
-
-    int loops = 1;
-    int l;
-    blasint inc_x=1;
-
-    if ((p = getenv("OPENBLAS_UPLO"))) uplo=*p;
-    if ((p = getenv("OPENBLAS_TRANS"))) trans=*p;
-    if ((p = getenv("OPENBLAS_DIAG"))) diag=*p;
-    if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-    if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-
-    blasint n, i, j;
-
-    int from =   1;
-    int to   = 200;
-    int step =   1;
-
-    double time1, timeg;
-
-    argc--;argv++;
-
-    if (argc > 0) { from     = atol(*argv);        argc--; argv++;}
-    if (argc > 0) { to       = MAX(atol(*argv), from);    argc--; argv++;}
-    if (argc > 0) { step     = atol(*argv);        argc--; argv++;}
-
-    fprintf(stderr, "From : %3d  To : %3d Step = %3d Uplo = %c Trans = %c  Diag = %c Loops=%d Inc_x=%d\n", from,
-            to, step, uplo, trans, diag, loops, inc_x);
-
-    if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL) {
-        fprintf(stderr,"Out of Memory!!\n");exit(1);
-    }
-
-    if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-        fprintf(stderr,"Out of Memory!!\n");exit(1);
-    }
-
-#ifdef __linux
-    srandom(getpid());
-#endif
-
-    fprintf(stderr, "   SIZE       Flops\n");
-
-    for(n = from; n <= to; n += step) {
-        timeg=0;
-
-        fprintf(stderr, " %6d : ", (int)n);
-        for(j = 0; j < n; j++) {
-            for(i = 0; i < n * COMPSIZE; i++) {
-                a[(long)i + (long)j * (long)n * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-            }
-        }
-
-        for (i = 0; i < n * COMPSIZE * abs(inc_x); i++) {
-            x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-        }
-
-        for (l = 0; l < loops; l++) {
-            begin();
-            TRMV (&uplo, &trans, &diag, &n, a, &n, x, &inc_x);
-            end();
-
-            time1 = getsec();
-            timeg += time1;
-        }
-
-        timeg /= loops;
-        fprintf(stderr, " %10.2f MFlops %12.9f sec\n",
-                COMPSIZE * COMPSIZE * 1. * (double)n * (double)n / timeg / 1.e6, timeg);
-    }
-
-    return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));
--- a/benchmark/trsm.c
+++ b/benchmark/trsm.c
@@ -25,7 +25,12 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"


 #undef TRSM
@@ -48,6 +53,71 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #endif

+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *a, *b;
@@ -81,6 +151,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1;

  argc--;argv++;
@@ -101,7 +172,7 @@ int main(int argc, char *argv[]){



-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -120,18 +191,18 @@ int main(int argc, char *argv[]){

   		 for(j = 0; j < m; j++){
      			for(i = 0; i < m * COMPSIZE; i++){
-				a[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-				b[(long)i + (long)j * (long)m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+				a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+				b[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
      		 	}
    		 }

-    		begin();
+    		gettimeofday( &start, (struct timezone *)0);

    		TRSM (&side, &uplo, &trans, &diag, &m, &m, alpha, a, &m, b, &m);

-    		end();
+    		gettimeofday( &stop, (struct timezone *)0);

-    		time1 = getsec();
+    		time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

 		timeg += time1;
        }
--- a/benchmark/trsv.c
+++ b/benchmark/trsv.c
@@ -1,143 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "bench.h"
-
-#undef GEMV
-#undef TRSV
-
-#ifndef COMPLEX
-
-#ifdef DOUBLE
-#define TRSV   BLASFUNC(dtrsv)
-#else
-#define TRSV   BLASFUNC(strsv)
-#endif
-
-#else
-
-#ifdef DOUBLE
-#define TRSV   BLASFUNC(ztrsv)
-#else
-#define TRSV   BLASFUNC(ctrsv)
-#endif
-
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *a, *x;
-  blasint n = 0, i, j;
-  blasint inc_x=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  time_t seconds = 0;
-
-  double time1,timeg;
-  long long nanos = 0;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  char uplo ='L';
-  char transa = 'N';
-  char diag ='U';
-
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-  if ((p = getenv("OPENBLAS_TRANSA")))  transa=*p;
-  if ((p = getenv("OPENBLAS_DIAG")))  diag=*p;
-  if ((p = getenv("OPENBLAS_UPLO")))  uplo=*p;
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Transa = '%c' Inc_x = %d uplo=%c diag=%c loop = %d\n", from, to, step,transa,inc_x,
-          uplo,diag,loops);
-
-
-#ifdef __linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-  fprintf(stderr, "============================================\n");
-
-  for(n = from; n <= to; n += step)
-  {
-      timeg=0;
-      if (( a = (FLOAT *)malloc(sizeof(FLOAT) * n * n * COMPSIZE)) == NULL){
-          fprintf(stderr,"Out of Memory!!\n");exit(1);
-      }
-
-      if (( x = (FLOAT *)malloc(sizeof(FLOAT) * n * abs(inc_x) * COMPSIZE)) == NULL){
-          fprintf(stderr,"Out of Memory!!\n");exit(1);
-      }
-
-      for(j = 0; j < n; j++){
-          for(i = 0; i < n * COMPSIZE; i++){
-              a[i + j * n * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-          }
-      }
-
-      for(i = 0; i < n * COMPSIZE * abs(inc_x); i++){
-          x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-      }
-
-      for(l =0;l< loops;l++){
-
-          begin();
-          TRSV(&uplo,&transa,&diag,&n,a,&n,x,&inc_x);
-          end();
-          time1 = getsec();
-          timeg += time1;
-      }
-
-      timeg /= loops;
-      long long muls = n*(n+1)/2.0;
-      long long adds = (n - 1.0)*n/2.0;
-
-      fprintf(stderr, "%10d   %10.2f MFlops %10.6f sec\n", n,(muls+adds) / timeg * 1.e-6, timeg);
-      if(a != NULL){
-        free(a);
-      }
-
-      if( x != NULL){
-        free(x);
-      }
-
-  }
-
-  return 0;
-}
-
--- a/benchmark/zdot-intel.c
+++ b/benchmark/zdot-intel.c
@@ -25,18 +25,90 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
-
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
 #define RETURN_BY_STACK 1
+#include "common.h"
+

 #undef DOT

+
 #ifdef DOUBLE
 #define DOT   BLASFUNC(zdotu)
 #else
 #define DOT   BLASFUNC(cdotu)
 #endif

+
+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *x, *y;
@@ -51,6 +123,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1,timeg;

  argc--;argv++;
@@ -73,7 +146,7 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -97,13 +170,13 @@ int main(int argc, char *argv[]){
   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
 			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
   	}
-    	begin();
+    	gettimeofday( &start, (struct timezone *)0);

    	DOT (&result, &m, x, &inc_x, y, &inc_y );

-    	end();
+    	gettimeofday( &stop, (struct timezone *)0);

-    	time1 = getsec();
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

 	timeg += time1;

--- a/benchmark/zdot.c
+++ b/benchmark/zdot.c
@@ -25,7 +25,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include "bench.h"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __CYGWIN32__
+#include <sys/time.h>
+#endif
+#include "common.h"
+

 #undef DOT

@@ -36,6 +42,72 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define DOT   BLASFUNC(cdotu)
 #endif

+
+#if defined(__WIN32__) || defined(__WIN64__)
+
+#ifndef DELTA_EPOCH_IN_MICROSECS
+#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+int gettimeofday(struct timeval *tv, void *tz){
+
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+
+  if (NULL != tv)
+    {
+      GetSystemTimeAsFileTime(&ft);
+
+      tmpres |= ft.dwHighDateTime;
+      tmpres <<= 32;
+      tmpres |= ft.dwLowDateTime;
+
+      /*converting file time to unix epoch*/
+      tmpres /= 10;  /*convert into microseconds*/
+      tmpres -= DELTA_EPOCH_IN_MICROSECS;
+      tv->tv_sec = (long)(tmpres / 1000000UL);
+      tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+  return 0;
+}
+
+#endif
+
+#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
+
+static void *huge_malloc(BLASLONG size){
+  int shmid;
+  void *address;
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+
+  if ((shmid =shmget(IPC_PRIVATE,
+		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
+		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
+    printf( "Memory allocation failed(shmget).\n");
+    exit(1);
+  }
+
+  address = shmat(shmid, NULL, SHM_RND);
+
+  if ((BLASLONG)address == -1){
+    printf( "Memory allocation failed(shmat).\n");
+    exit(1);
+  }
+
+  shmctl(shmid, IPC_RMID, 0);
+
+  return address;
+}
+
+#define malloc huge_malloc
+
+#endif
+
 int main(int argc, char *argv[]){

  FLOAT *x, *y;
@@ -50,6 +122,7 @@ int main(int argc, char *argv[]){
  int to   = 200;
  int step =   1;

+  struct timeval start, stop;
  double time1,timeg;

  argc--;argv++;
@@ -72,7 +145,7 @@ int main(int argc, char *argv[]){
    fprintf(stderr,"Out of Memory!!\n");exit(1);
  }

-#ifdef __linux
+#ifdef linux
  srandom(getpid());
 #endif

@@ -96,15 +169,13 @@ int main(int argc, char *argv[]){
   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
 			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
   	}
-    	begin();
-#ifdef RETURN_BY_STACK
-    	DOT (&result , &m, x, &inc_x, y, &inc_y );
-#else
-    	result = DOT (&m, x, &inc_x, y, &inc_y );
-#endif
-    	end();
+    	gettimeofday( &start, (struct timezone *)0);

-    	time1 = getsec();
+    	result = DOT (&m, x, &inc_x, y, &inc_y );
+
+    	gettimeofday( &stop, (struct timezone *)0);
+
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;

 	timeg += time1;

--- a/673
+++ b/673
@@ -1,431 +1,316 @@
-#!/bin/sh
+#!/usr/bin/perl
+
+use File::Basename;
+use File::Temp qw(tempfile);

 # Checking cross compile
-hostos=`uname -s | sed -e 's/\-.*//'`
-hostarch=`uname -m | sed -e 's/i.86/x86/'`
-if [ "$hostos" = "AIX" ] || [ "$hostos" = "SunOS" ]; then
-    hostarch=`uname -p`
-fi
-case "$hostarch" in
-    amd64) hostarch=x86_64 ;;
-    arm*) [ "$hostarch" = "arm64" ] || hostarch='arm' ;;
-    aarch64) hostarch=arm64 ;;
-    powerpc*|ppc*) hostarch=power ;;
-    s390x) hostarch=zarch ;;
-esac
+$hostos   = `uname -s | sed -e s/\-.*//`;    chop($hostos);
+$hostarch = `uname -m | sed -e s/i.86/x86/`;chop($hostarch);
+$hostarch = "x86_64" if ($hostarch eq "amd64");
+$hostarch = "arm" if ($hostarch =~ /^arm.*/);
+$hostarch = "arm64" if ($hostarch eq "aarch64");
+$hostarch = "power" if ($hostarch =~ /^(powerpc|ppc).*/);
+$hostarch = "zarch" if ($hostarch eq "s390x");

-makefile="$1"
-config="$2"
+$tmpf = new File::Temp( UNLINK => 1 );
+$binary = $ENV{"BINARY"};

-compiler_name="$3"
-shift 3
-flags="$*"
+$makefile = shift(@ARGV);
+$config   = shift(@ARGV);
+
+$compiler_name = join(" ", @ARGV);

 # First, we need to know the target OS and compiler name
-{
-    data=`$compiler_name $flags -E ctest.c`
-} || {
-    printf '%s\n' "C Compiler ($compiler_name) is something wrong." >&2
-    exit 1
+
+$data = `$compiler_name -E ctest.c`;
+
+if ($?) {
+    printf STDERR "C Compiler ($compiler_name) is something wrong.\n";
+    die 1;
 }

-cross_suffix=""
+$cross_suffix = "";

-if [ "`dirname \"$compiler_name\"`" != '.' ]; then
-    cross_suffix="$cross_suffix`dirname \"$compiler_name\"`/"
-fi
+if (dirname($compiler_name) ne ".") {
+    $cross_suffix .= dirname($compiler_name) . "/";
+}

-cn= `echo $compiler_name | sed -e 's/ -.*//'`
-bn=`basename "$cn"`
+if (basename($compiler_name) =~ /([^\s]*-)(.*)/) {
+    $cross_suffix .= $1;
+}

-case "$bn" in
-    *-*) if [ "$bn" != '-' ]; then
-           cross_suffix="$cross_suffix${bn%-*}-"
-         fi
-esac
+$compiler = "";
+$compiler = LSB       if ($data =~ /COMPILER_LSB/);
+$compiler = CLANG     if ($data =~ /COMPILER_CLANG/);
+$compiler = PGI       if ($data =~ /COMPILER_PGI/);
+$compiler = PATHSCALE if ($data =~ /COMPILER_PATHSCALE/);
+$compiler = INTEL     if ($data =~ /COMPILER_INTEL/);
+$compiler = OPEN64    if ($data =~ /COMPILER_OPEN64/);
+$compiler = SUN       if ($data =~ /COMPILER_SUN/);
+$compiler = IBM       if ($data =~ /COMPILER_IBM/);
+$compiler = DEC       if ($data =~ /COMPILER_DEC/);
+$compiler = GCC       if ($compiler eq "");

-compiler=""
-case "$data" in
-    *COMPILER_LSB*) compiler=LSB ;;
-    *COMPILER_CLANG*) compiler=CLANG ;;
-    *COMPILER_PGI*) compiler=PGI ;;
-    *COMPILER_PATHSCALE*) compiler=PATHSCALE ;;
-    *COMPILER_INTEL*) compiler=INTEL ;;
-    *COMPILER_OPEN64*) compiler=OPEN64 ;;
-    *COMPILER_SUN*) compiler=SUN ;;
-    *COMPILER_IBM*) compiler=IBM ;;
-    *COMPILER_DEC*) compiler=DEC ;;
-    *COMPILER_FUJITSU*) compiler=FUJITSU ;;
-esac
-if [ -z "$compiler" ]; then
-    compiler=GCC
-fi
+$os = Linux           if ($data =~ /OS_LINUX/);
+$os = FreeBSD         if ($data =~ /OS_FREEBSD/);
+$os = NetBSD          if ($data =~ /OS_NETBSD/);
+$os = Darwin          if ($data =~ /OS_DARWIN/);
+$os = SunOS           if ($data =~ /OS_SUNOS/);
+$os = AIX             if ($data =~ /OS_AIX/);
+$os = osf             if ($data =~ /OS_OSF/);
+$os = WINNT           if ($data =~ /OS_WINNT/);
+$os = CYGWIN_NT       if ($data =~ /OS_CYGWIN_NT/);
+$os = Interix         if ($data =~ /OS_INTERIX/);
+$os = Android         if ($data =~ /OS_ANDROID/);

-case "$data" in *OS_LINUX*) os=Linux ;; esac
-case "$data" in *OS_FREEBSD*) os=FreeBSD ;; esac
-case "$data" in *OS_NETBSD*) os=NetBSD ;; esac
-case "$data" in *OS_OPENBSD*) os=OpenBSD ;; esac
-case "$data" in *OS_DRAGONFLY*) os=DragonFly ;; esac
-case "$data" in *OS_DARWIN*) os=Darwin ;; esac
-case "$data" in *OS_SUNOS*) os=SunOS ;; esac
-case "$data" in *OS_AIX*) os=AIX ;; esac
-case "$data" in *OS_OSF*) os=osf ;; esac
-case "$data" in *OS_WINNT*) os=WINNT ;; esac
-case "$data" in *OS_CYGWIN_NT*) os=CYGWIN_NT ;; esac
-case "$data" in *OS_INTERIX*) os=Interix ;; esac
-case "$data" in *OS_ANDROID*) os=Android ;; esac
-case "$data" in *OS_HAIKU*) os=Haiku ;; esac
+$architecture = x86    if ($data =~ /ARCH_X86/);
+$architecture = x86_64 if ($data =~ /ARCH_X86_64/);
+$architecture = power  if ($data =~ /ARCH_POWER/);
+$architecture = mips   if ($data =~ /ARCH_MIPS/);
+$architecture = mips64 if ($data =~ /ARCH_MIPS64/);
+$architecture = alpha  if ($data =~ /ARCH_ALPHA/);
+$architecture = sparc  if ($data =~ /ARCH_SPARC/);
+$architecture = ia64   if ($data =~ /ARCH_IA64/);
+$architecture = arm    if ($data =~ /ARCH_ARM/);
+$architecture = arm64  if ($data =~ /ARCH_ARM64/);
+$architecture = zarch  if ($data =~ /ARCH_ZARCH/);

-case "$data" in
-    *ARCH_X86_64*) architecture=x86_64 ;;
-    *ARCH_X86*) architecture=x86 ;;
-    *ARCH_E2K*) architecture=e2k ;;
-    *ARCH_POWER*) architecture=power ;;
-    *ARCH_MIPS64*) architecture=mips64 ;;
-    *ARCH_MIPS*) architecture=mips ;;
-    *ARCH_ALPHA*) architecture=alpha ;;
-    *ARCH_SPARC*) architecture=sparc ;;
-    *ARCH_IA64*) architecture=ia64 ;;
-    *ARCH_ARM64*) architecture=arm64 ;;
-    *ARCH_ARM*) architecture=arm ;;
-    *ARCH_ZARCH*) architecture=zarch ;;
-    *ARCH_RISCV64*) architecture=riscv64 ;;
-    *ARCH_LOONGARCH64*) architecture=loongarch64 ;;
-esac
+$defined = 0;

-defined=0
+if ($os eq "AIX") {
+    $compiler_name .= " -maix32" if ($binary eq "32");
+    $compiler_name .= " -maix64" if ($binary eq "64");
+    $defined = 1;
+}

-if [ "$os" = "AIX" ]; then
-    case "$BINARY" in
-        32) compiler_name="$compiler_name -maix32" ;;
-        64) compiler_name="$compiler_name -maix64" ;;
-    esac
-    defined=1
-fi
+if ($architecture eq "mips") {
+    $compiler_name .= " -mabi=32";
+    $defined = 1;
+}

-case "$architecture" in
-    mips)
-    	compiler_name="$compiler_name -mabi=32"
-    	defined=1
-    	;;
-    mips64)
-    	case "$BINARY" in
-    	    32) compiler_name="$compiler_name -mabi=n32" ;;
-    	    64) compiler_name="$compiler_name -mabi=64" ;;
-    	esac
-    	defined=1
-    	;;
-    arm|arm64) defined=1 ;;
-    zarch|e2k|alpha|ia64|riscv64|loonarch64)
-    	defined=1
-    	BINARY=64
-    	;;
-    x86)
-    	[ "$os" != "Darwin" ] && [ "$os" != "SunOS" ] && {
-    	    defined=1
-    	    BINARY=32
-    	}
-    	;;
-esac
+if ($architecture eq "mips64") {
+    $compiler_name .= " -mabi=n32" if ($binary eq "32");
+    $compiler_name .= " -mabi=64" if ($binary eq "64");
+    $defined = 1;
+}

-case "$compiler" in
-    PGI)
-    	case "$BINARY" in
-    	    32) compiler_name="$compiler_name -tp p7" ;;
-    	    64) compiler_name="$compiler_name -tp p7-64" ;;
-    	esac
-    	openmp='-mp'
-    	defined=1
-    	;;
-    IBM)
-    	case "$BINARY" in
-    	    32) compiler_name="$compiler_name -q32" ;;
-    	    64) compiler_name="$compiler_name -q64" ;;
-    	esac
-    	openmp='-qsmp=omp'
-    	defined=1
-    	;;
-    INTEL) openmp='-openmp' ;;
-    PATHSCALE|OPEN64) openmp='-mp' ;;
-    CLANG|GCC|LSB) openmp='-fopenmp' ;;
-    FUJITSU) openmp='-Kopenmp' ;;
-esac
+if (($architecture eq "arm") || ($architecture eq "arm64")) {
+    $defined = 1;
+}

-if [ "$defined" -eq 0 ]; then
-    case "$BINARY" in
-    	32) compiler_name="$compiler_name -m32" ;;
-    	64) compiler_name="$compiler_name -m64" ;;
-    esac
-fi
+if ($architecture eq "zarch") {
+    $defined = 1;
+    $binary = 64;
+}
+
+if ($architecture eq "alpha") {
+    $defined = 1;
+    $binary = 64;
+}
+
+if ($architecture eq "ia64") {
+    $defined = 1;
+    $binary = 64;
+}
+
+if (($architecture eq "x86") && ($os ne Darwin) && ($os ne SunOS)) {
+    $defined = 1;
+    $binary =32;
+}
+
+if ($compiler eq "PGI") {
+    $compiler_name .= " -tp p7"    if ($binary eq "32");
+    $compiler_name .= " -tp p7-64" if ($binary eq "64");
+    $openmp = "-mp";
+    $defined = 1;
+}
+
+if ($compiler eq "IBM") {
+    $compiler_name .= " -q32"  if ($binary eq "32");
+    $compiler_name .= " -q64"  if ($binary eq "64");
+    $openmp = "-qsmp=omp";
+    $defined = 1;
+}
+
+if ($compiler eq "INTEL") {
+    $openmp = "-openmp";
+}
+
+if ($compiler eq "PATHSCALE") {
+    $openmp = "-mp";
+}
+
+if ($compiler eq "OPEN64") {
+    $openmp = "-mp";
+}
+
+if ($compiler eq "CLANG") {
+    $openmp = "-fopenmp";
+}
+
+if ($compiler eq "GCC" || $compiler eq "LSB") {
+    $openmp = "-fopenmp";
+}
+
+if ($defined == 0) {
+    $compiler_name .= " -m32" if ($binary eq "32");
+    $compiler_name .= " -m64" if ($binary eq "64");
+}

 # Do again
+
+$data = `$compiler_name -E ctest.c`;
+
+if ($?) {
+    printf STDERR "C Compiler ($compiler_name) is something wrong.\n";
+    die 1;
+}
+
+$have_msa = 0;
+if (($architecture eq "mips") || ($architecture eq "mips64")) {
+    $code = '"addvi.b $w0, $w1, 1"';
+    $msa_flags = "-mmsa -mfp64 -msched-weight -mload-store-pairs";
+    print $tmpf "#include <msa.h>\n\n";
+    print $tmpf "void main(void){ __asm__ volatile($code); }\n";
+
+    $args = "$msa_flags -o $tmpf.o -x c $tmpf";
+    my @cmd = ("$compiler_name $args");
+    system(@cmd) == 0;
+    if ($? != 0) {
+        $have_msa = 0;
+    } else {
+        $have_msa = 1;
+    }
+    unlink("$tmpf.o");
+}
+
+$architecture = x86    if ($data =~ /ARCH_X86/);
+$architecture = x86_64 if ($data =~ /ARCH_X86_64/);
+$architecture = power  if ($data =~ /ARCH_POWER/);
+$architecture = mips   if ($data =~ /ARCH_MIPS/);
+$architecture = mips64 if ($data =~ /ARCH_MIPS64/);
+$architecture = alpha  if ($data =~ /ARCH_ALPHA/);
+$architecture = sparc  if ($data =~ /ARCH_SPARC/);
+$architecture = ia64   if ($data =~ /ARCH_IA64/);
+$architecture = arm    if ($data =~ /ARCH_ARM/);
+$architecture = arm64  if ($data =~ /ARCH_ARM64/);
+$architecture = zarch  if ($data =~ /ARCH_ZARCH/);
+
+$binformat    = bin32;
+$binformat    = bin64  if ($data =~ /BINARY_64/);
+
+$data = `$compiler_name -S ctest1.c && grep globl ctest1.s | head -n 1 && rm -f ctest1.s`;
+
+$data =~ /globl\s([_\.]*)(.*)/;
+
+$need_fu      = $1;
+
+$cross = 0;
+$cross = 1 if ($os ne $hostos);
+
+if ($architecture ne $hostarch) {
+    $cross = 1;
+    $cross = 0 if (($hostarch eq "x86_64") && ($architecture eq "x86"));
+    $cross = 0 if (($hostarch eq "mips64") && ($architecture eq "mips"));
+}
+
+$openmp = "" if $ENV{USE_OPENMP} != 1;
+
+$linker_L = "";
+$linker_l = "";
+$linker_a = "";
+
 {
-    data="$($compiler_name $flags -E ctest.c)"
-} || {
-    printf '%s\n' "C Compiler ($compiler_name) is something wrong." >&2
-    exit 1
+    $link = `$compiler_name -c ctest2.c -o ctest2.o 2>&1 && $compiler_name $openmp -v ctest2.o -o ctest2 2>&1 && rm -f ctest2.o ctest2 ctest2.exe`;
+
+    $link =~ s/\-Y\sP\,/\-Y/g;
+
+    @flags = split(/[\s\,\n]/, $link);
+    # remove leading and trailing quotes from each flag.
+    @flags = map {s/^['"]|['"]$//g; $_} @flags;
+
+    foreach $flags (@flags) {
+	if (
+	    ($flags =~ /^\-L/)
+	    && ($flags !~ /^-LIST:/)
+	    && ($flags !~ /^-LANG:/)
+	    ) {
+	    $linker_L .= $flags . " "
+	    }
+
+	if ($flags =~ /^\-Y/) {
+	    $linker_L .= "-Wl,". $flags . " "
+	    }
+
+	if ($flags =~ /^\--exclude-libs/) {
+	    $linker_L .= "-Wl,". $flags . " ";
+	    $flags="";
+	   }
+
+	if (
+	    ($flags =~ /^\-l/)
+	    && ($flags !~ /gfortranbegin/)
+	    && ($flags !~ /frtbegin/)
+	    && ($flags !~ /pathfstart/)
+	    && ($flags !~ /numa/)
+	    && ($flags !~ /crt[0-9]/)
+	    && ($flags !~ /gcc/)
+	    && ($flags !~ /user32/)
+	    && ($flags !~ /kernel32/)
+	    && ($flags !~ /advapi32/)
+	    && ($flags !~ /shell32/)
+	    ) {
+	    $linker_l .= $flags . " "
+	}
+
+	$linker_a .= $flags . " " if $flags =~ /\.a$/;
+    }
+
 }

-no_msa=0
-if [ "$architecture" = "mips" ] || [ "$architecture" = "mips64" ]; then
-    tmpd=$(mktemp -d 2>/dev/null || mktemp -d -t 'OBC')
-    tmpf="$tmpd/a.c"
-    code='"addvi.b $w0, $w1, 1"'
-    msa_flags='-mmsa -mfp64 -mload-store-pairs'
-    printf "#include <msa.h>\n\n" >> "$tmpf"
-    printf "void main(void){ __asm__ volatile(%s); }\n" "$code" >> "$tmpf"
-
-    args="$msa_flags -o $tmpf.o $tmpf"
-    {
-    	$compiler_name $flags $args >/dev/null 2>&1
-    } || {
-    	no_msa=1
-    }
-
-    rm -rf "$tmpd"
-fi
-
-case "$data" in
-    *ARCH_X86_64*) architecture=x86_64 ;;
-    *ARCH_X86*) architecture=x86 ;;
-    *ARCH_E2K*) architecture=e2k ;;
-    *ARCH_POWER*) architecture=power ;;
-    *ARCH_MIPS64*) architecture=mips64 ;;
-    *ARCH_MIPS*) architecture=mips ;;
-    *ARCH_ALPHA*) architecture=alpha ;;
-    *ARCH_SPARC*) architecture=sparc ;;
-    *ARCH_IA64*) architecture=ia64 ;;
-    *ARCH_ARM64*) architecture=arm64 ;;
-    *ARCH_ARM*) architecture=arm ;;
-    *ARCH_ZARCH*) architecture=zarch ;;
-    *ARCH_LOONGARCH64*) architecture=loongarch64 ;;
-esac
-
-binformat='bin32'
-case "$data" in
-    *BINARY_64*) binformat='bin64' ;;
-esac
-
-no_avx512=0
-if [ "$architecture" = "x86" ] || [ "$architecture" = "x86_64" ]; then
-    tmpd=$(mktemp -d 2>/dev/null || mktemp -d -t 'OBC')
-    tmpf="$tmpd/a.c"
-    code='"vbroadcastss -4 * 4(%rsi), %zmm2"'
-    printf "#include <immintrin.h>\n\nint main(void){ __asm__ volatile(%s); }\n" "$code" >> "$tmpf"
-    if [ "$compiler" = "PGI" ]; then
-        args=" -tp skylake -c -o $tmpf.o $tmpf"
-    else
-        args=" -march=skylake-avx512 -c -o $tmpf.o $tmpf"
-    fi
-    no_avx512=0
-    {
-    	$compiler_name $flags $args >/dev/null 2>&1
-    } || {
-    	no_avx512=1
-    }
-
-    rm -rf "$tmpd"
-fi
-
-no_rv64gv=0
-if [ "$architecture" = "riscv64" ]; then
-    tmpd=$(mktemp -d 2>/dev/null || mktemp -d -t 'OBC')
-    tmpf="$tmpd/a.c"
-    code='"vsetvli    zero, zero, e8, m1\n"'
-    printf "int main(void){ __asm__ volatile(%s); }\n" "$code" >> "$tmpf"
-    args=" -march=rv64gv -c -o $tmpf.o $tmpf"
-    no_rv64gv=0
-    {
-        $compiler_name $flags $args >/dev/null 2>&1
-    } || {
-        no_rv64gv=1
-    }
-    rm -rf "$tmpd"
-fi
-
-no_sve=0
-if [ "$architecture" = "arm64" ]; then
-    tmpd=$(mktemp -d 2>/dev/null || mktemp -d -t 'OBC')
-    tmpf="$tmpd/a.c"
-    printf "#include <arm_sve.h>\n\n int main(void){}\n">> "$tmpf"
-    args=" -march=armv8-a+sve -c -o $tmpf.o $tmpf"
-    no_sve=0
-    {
-        $compiler_name $flags $args >/dev/null 2>&1
-    } || {
-        no_sve=1
-    }
-    rm -rf "$tmpd"
-fi
-
-c11_atomics=0
-case "$data" in
-    *HAVE_C11*)
-        tmpd=$(mktemp -d 2>/dev/null || mktemp -d -t 'OBC')
-        tmpf="$tmpd/a.c"
-        printf "#include <stdatomic.h>\nint main(void){}\n" >> "$tmpf"
-        args=" -c -o $tmpf.o $tmpf"
-        c11_atomics=1
-        {
-            $compiler_name $flags $args >/dev/null 2>&1
-        } || {
-            c11_atomics=0
-        }
-
-        rm -rf "$tmpd"
-        ;;
-esac
-
-oldgcc=0
-no_avx2=0
-if [ "$compiler" = "GCC" ]; then
-    case "$architecture" in x86|x86_64)
-        no_avx2=0
-        oldgcc=0
-        data=`$compiler_name -dumpversion`
-        case "$data" in *.*.*)
-            data="${data%.*}"
-        esac
-        if awk -v n1=$data -v n2=4.6 'BEGIN { exit !(n1 <= n2) }'; then
-            no_avx2=1
-            oldgcc=1
-        fi
-    esac
-fi
-
-data=`$compiler_name $flags -S ctest1.c && grep globl ctest1.s | head -n 1 && rm -f ctest1.s`
-
-need_fu=''
-if echo "$data" | grep 'globl[[:space:]][_\.]'; then
-    need_fu="${data##*globl[[:space:]]}"
-    need_fu="${need_fu%%[!_\.]*}"
-fi
-
-cross=0
-
-if [ "$architecture" != "$hostarch" ]; then
-    cross=1
-    [ "$hostarch" = "x86_64" ] && [ "$architecture" = "x86" ] && cross=0
-    [ "$hostarch" = "mips64" ] && [ "$architecture" = "mips" ] && cross=0
-fi
-
-[ "$os" != "$hostos" ] && cross=1
-[ "$os" = "Android" ] && [ "$hostos" = "Linux" ] && [ -n "$TERMUX_APP_PID" ] \
-    && cross=0
-
-[ "$USE_OPENMP" != 1 ] && openmp=''
-
-linker_L=""
-linker_l=""
-linker_a=""
-
-link=`$compiler_name $flags -c ctest2.c -o ctest2.o 2>&1 && $compiler_name $flags $openmp -v ctest2.o -o ctest2 2>&1 && rm -f ctest2.o ctest2 ctest2.exe`
-
-link=`echo "$link" | sed 's/\-Y[[:space:]]P\,/\-Y/g'`
-
-
-flags=`echo $link | tr "'[[:space:]],\n" " "`
-
-# Strip trailing quotes
-old_flags="$flags"
-flags=''
-
-
-for flag in $old_flags; do
-    f=`echo "$flag" | tr '"' ' '`
-    flags="$flags $f"
-done
-
-for flag in $flags; do
-    case "$flag" in -L*)
-        case "$flag" in
-            -LIST:*|-LANG:*) ;;
-            *) linker_L="$linker_L $flag" ;;
-        esac
-    esac
-
-    case "$flag" in -Y*)
-        linker_L="$linker_L -Wl,$flag" ;;
-    esac
-
-    case "$flag" in --exclude-libs*)
-        linker_L="$linker_L -Wl,$flag"
-        flags=""
-        ;;
-    esac
-
-    case "$flag" in -l*)
-        case "$flag" in
-            *gfortranbegin*|*frtbegin*|*pathfstart*|*numa*|*crt[0-9]*|\
-                *gcc*|*user32*|*kernel32*|*advapi32*|*shell32*|*omp*|\
-                *[0-9]*) ;;
-            *) linker_l="$linker_l $flag" ;;
-        esac
-    esac
-
-    case "$flag" in *.a) linker_a="$linker_a $flag" ;; esac
-done
-
- [ "$makefile" = "-" ] && {
-    [ "$no_rv64gv" -eq 1 ] && printf "NO_RV64GV=1\n"
-    [ "$no_avx512" -eq 1 ] && printf "NO_AVX512=1\n"
-    [ "$no_avx2" -eq 1 ] && printf "NO_AVX2=1\n"
-    [ "$oldgcc" -eq 1 ] && printf "OLDGCC=1\n"
-    exit 0
-}
-
-:> "$makefile" || exit 1
-:> "$config" || exit 1
-
+open(MAKEFILE, "> $makefile") || die "Can't create $makefile";
+open(CONFFILE, "> $config"  ) || die "Can't create $config";

 # print $data, "\n";

-{
-    printf "OSNAME=%s\n" "$os"
-    printf "ARCH=%s\n" "$architecture"
-    printf "C_COMPILER=%s\n" "$compiler"
-    [ $binformat != 'bin32' ] && printf "BINARY32=\n"
-    [ $binformat != 'bin64' ] && printf "BINARY64=\n"
-    [ "$binformat" = "bin32" ] && printf "BINARY32=1\n"
-    [ "$binformat" = "bin64" ] && printf "BINARY64=1\n"
-    [ -n "$need_fu" ] && printf 'FU=%s\n' "$need_fu"
-    [ "$cross" -ne 0 ] && [ -n "$cross_suffix" ] && \
-        printf "CROSS_SUFFIX=%s\n" "$cross_suffix"
-    [ "$cross" -ne 0 ] && printf "CROSS=1\n"
-    printf "CEXTRALIB=%s %s %s\n" "$linker_L" "$linker_l" "$linker_a"
-    [ "$no_msa" -eq 1 ] &&  printf "NO_MSA=1\n"
-    [ "$no_sve" -eq 1 ] && printf "NO_SVE=1\n"
-    [ "$no_rv64gv" -eq 1 ] && printf "NO_RV64GV=1\n"
-    [ "$no_avx512" -eq 1 ] && printf "NO_AVX512=1\n"
-    [ "$no_avx2" -eq 1 ] && printf "NO_AVX2=1\n"
-    [ "$oldgcc" -eq 1 ] && printf "OLDGCC=1\n"
-} >> "$makefile"
+print MAKEFILE "OSNAME=$os\n";
+print MAKEFILE "ARCH=$architecture\n";
+print MAKEFILE "C_COMPILER=$compiler\n";
+print MAKEFILE "BINARY32=\n" if $binformat ne bin32;
+print MAKEFILE "BINARY64=\n" if $binformat ne bin64;
+print MAKEFILE "BINARY32=1\n" if $binformat eq bin32;
+print MAKEFILE "BINARY64=1\n" if $binformat eq bin64;
+print MAKEFILE "FU=$need_fu\n" if $need_fu ne "";
+print MAKEFILE "CROSS_SUFFIX=$cross_suffix\n" if $cross != 0 && $cross_suffix ne "";
+print MAKEFILE "CROSS=1\n" if $cross != 0;
+print MAKEFILE "CEXTRALIB=$linker_L $linker_l $linker_a\n";
+print MAKEFILE "HAVE_MSA=1\n" if $have_msa eq 1;
+print MAKEFILE "MSA_FLAGS=$msa_flags\n" if $have_msa eq 1;

-os=`echo "$os" | tr '[[:lower:]]' '[[:upper:]]'/ `
-architecture=`echo "$architecture" | tr '[[:lower:]]' '[[:upper:]]' `
-compiler=`echo "$compiler" | tr '[[:lower:]]' '[[:upper:]]' `
+$os           =~ tr/[a-z]/[A-Z]/;
+$architecture =~ tr/[a-z]/[A-Z]/;
+$compiler     =~ tr/[a-z]/[A-Z]/;

-{
-    printf "#define OS_%s\t1\n" "$os"
-    printf "#define ARCH_%s\t1\n" "$architecture"
-    printf "#define C_%s\t1\n" "$compiler"
-    [ "$binformat" = "bin32" ] && printf "#define __32BIT__\t1\n"
-    [ "$binformat" = "bin64" ] && printf "#define __64BIT__\t1\n"
-    [ -n "$need_fu" ] && printf "#define FUNDERSCORE\t%s\n" "$need_fu"
-    [ "$no_msa" -eq 1 ] && printf "#define NO_MSA\t1\n"
-    [ "$c11_atomics" -eq 1 ] && printf "#define HAVE_C11\t1\n"
-} >> "$config"
+print CONFFILE "#define OS_$os\t1\n";
+print CONFFILE "#define ARCH_$architecture\t1\n";
+print CONFFILE "#define C_$compiler\t1\n";
+print CONFFILE "#define __32BIT__\t1\n"  if $binformat eq bin32;
+print CONFFILE "#define __64BIT__\t1\n"  if $binformat eq bin64;
+print CONFFILE "#define FUNDERSCORE\t$need_fu\n" if $need_fu ne "";
+print CONFFILE "#define HAVE_MSA\t1\n"  if $have_msa eq 1;

-
-if [ "$os" = "LINUX" ]; then
+if ($os eq "LINUX") {

 #    @pthread = split(/\s+/, `nm /lib/libpthread.so* | grep _pthread_create`);

 #    if ($pthread[2] ne "") {
 #	print CONFFILE "#define PTHREAD_CREATE_FUNC	$pthread[2]\n";
 #    } else {
-	printf "#define PTHREAD_CREATE_FUNC	pthread_create\n" >> "$config"
+	print CONFFILE "#define PTHREAD_CREATE_FUNC	pthread_create\n";
 #    }
-else
-    printf "#define PTHREAD_CREATE_FUNC	pthread_create\n" >> "$config"
-fi
+} else {
+    print CONFFILE "#define PTHREAD_CREATE_FUNC	pthread_create\n";
+}
+
+close(MAKEFILE);
+close(CONFFILE);
--- a/c_check.pl
+++ b/c_check.pl
@@ -1,456 +0,0 @@
-#!/usr/bin/env perl
-
-#use File::Basename;
-# use File::Temp qw(tempfile);
-
-# Checking cross compile
-$hostos   = `uname -s | sed -e s/\-.*//`;    chop($hostos);
-$hostarch = `uname -m | sed -e s/i.86/x86/`;
-$hostarch = `uname -p` if ($hostos eq "AIX" || $hostos eq "SunOS");
-chop($hostarch);
-$hostarch = "x86_64" if ($hostarch eq "amd64");
-$hostarch = "arm" if ($hostarch ne "arm64" && $hostarch =~ /^arm.*/);
-$hostarch = "arm64" if ($hostarch eq "aarch64");
-$hostarch = "power" if ($hostarch =~ /^(powerpc|ppc).*/);
-$hostarch = "zarch" if ($hostarch eq "s390x");
-
-#$tmpf = new File::Temp( UNLINK => 1 );
-$binary = $ENV{"BINARY"};
-
-$makefile = shift(@ARGV);
-$config   = shift(@ARGV);
-
-$compiler_name = shift(@ARGV);
-$flags = join(" ", @ARGV);
-
-# First, we need to know the target OS and compiler name
-
-$data = `$compiler_name $flags -E ctest.c`;
-
-if ($?) {
-    printf STDERR "C Compiler ($compiler_name) is something wrong.\n";
-    die 1;
-}
-
-$cross_suffix = "";
-
-eval "use File::Basename";
-if ($@){ 
-    warn "could not load PERL module File::Basename, emulating its functionality";
-    my $dirnam = substr($compiler_name, 0, rindex($compiler_name, "/")-1 );
-    if ($dirnam ne ".") {
-	$cross_suffix .= $dirnam . "/";
-    }
-    my $basnam = substr($compiler_name, rindex($compiler_name,"/")+1, length($compiler_name)-rindex($compiler_name,"/")-1);
-	if ($basnam =~ /([^\s]*-)(.*)/) {
-	$cross_suffix .= $1;
-    }
-} else {
-    if (dirname($compiler_name) ne ".") {
-	$cross_suffix .= dirname($compiler_name) . "/";
-    }
-
-    if (basename($compiler_name) =~ /([^\s]*-)(.*)/) {
-	$cross_suffix .= $1;
-    }
-}
-
-$compiler = "";
-$compiler = LSB       if ($data =~ /COMPILER_LSB/);
-$compiler = CLANG     if ($data =~ /COMPILER_CLANG/);
-$compiler = PGI       if ($data =~ /COMPILER_PGI/);
-$compiler = PATHSCALE if ($data =~ /COMPILER_PATHSCALE/);
-$compiler = INTEL     if ($data =~ /COMPILER_INTEL/);
-$compiler = OPEN64    if ($data =~ /COMPILER_OPEN64/);
-$compiler = SUN       if ($data =~ /COMPILER_SUN/);
-$compiler = IBM       if ($data =~ /COMPILER_IBM/);
-$compiler = DEC       if ($data =~ /COMPILER_DEC/);
-$compiler = FUJITSU   if ($data =~ /COMPILER_FUJITSU/);
-$compiler = GCC       if ($compiler eq "");
-
-$os = Linux           if ($data =~ /OS_LINUX/);
-$os = FreeBSD         if ($data =~ /OS_FREEBSD/);
-$os = NetBSD          if ($data =~ /OS_NETBSD/);
-$os = OpenBSD         if ($data =~ /OS_OPENBSD/);
-$os = DragonFly       if ($data =~ /OS_DRAGONFLY/);
-$os = Darwin          if ($data =~ /OS_DARWIN/);
-$os = SunOS           if ($data =~ /OS_SUNOS/);
-$os = AIX             if ($data =~ /OS_AIX/);
-$os = osf             if ($data =~ /OS_OSF/);
-$os = WINNT           if ($data =~ /OS_WINNT/);
-$os = CYGWIN_NT       if ($data =~ /OS_CYGWIN_NT/);
-$os = Interix         if ($data =~ /OS_INTERIX/);
-$os = Android         if ($data =~ /OS_ANDROID/);
-$os = Haiku           if ($data =~ /OS_HAIKU/);
-
-$architecture = x86          if ($data =~ /ARCH_X86/);
-$architecture = x86_64       if ($data =~ /ARCH_X86_64/);
-$architecture = e2k          if ($data =~ /ARCH_E2K/);
-$architecture = power        if ($data =~ /ARCH_POWER/);
-$architecture = mips         if ($data =~ /ARCH_MIPS/);
-$architecture = mips64       if ($data =~ /ARCH_MIPS64/);
-$architecture = alpha        if ($data =~ /ARCH_ALPHA/);
-$architecture = sparc        if ($data =~ /ARCH_SPARC/);
-$architecture = ia64         if ($data =~ /ARCH_IA64/);
-$architecture = arm          if ($data =~ /ARCH_ARM/);
-$architecture = arm64        if ($data =~ /ARCH_ARM64/);
-$architecture = zarch        if ($data =~ /ARCH_ZARCH/);
-$architecture = riscv64      if ($data =~ /ARCH_RISCV64/);
-$architecture = loongarch64  if ($data =~ /ARCH_LOONGARCH64/);
-
-$defined = 0;
-
-if ($os eq "AIX") {
-    $compiler_name .= " -maix32" if ($binary eq "32");
-    $compiler_name .= " -maix64" if ($binary eq "64");
-    $defined = 1;
-}
-
-if ($architecture eq "mips") {
-    $compiler_name .= " -mabi=32";
-    $defined = 1;
-}
-
-if ($architecture eq "mips64") {
-    $compiler_name .= " -mabi=n32" if ($binary eq "32");
-    $compiler_name .= " -mabi=64" if ($binary eq "64");
-    $defined = 1;
-}
-
-if (($architecture eq "arm") || ($architecture eq "arm64")) {
-    $defined = 1;
-}
-
-if ($architecture eq "zarch") {
-    $defined = 1;
-    $binary = 64;
-}
-
-if ($architecture eq "e2k") {
-    $defined = 1;
-    $binary = 64;
-}
-
-if ($architecture eq "alpha") {
-    $defined = 1;
-    $binary = 64;
-}
-
-if ($architecture eq "ia64") {
-    $defined = 1;
-    $binary = 64;
-}
-
-if (($architecture eq "x86") && ($os ne Darwin) && ($os ne SunOS)) {
-    $defined = 1;
-    $binary =32;
-}
-
-if ($architecture eq "riscv64") {
-    $defined = 1;
-    $binary = 64;
-}
-
-if ($architecture eq "loongarch64") {
-    $defined = 1;
-    $binary = 64;
-}
-
-if ($compiler eq "PGI") {
-    $compiler_name .= " -tp p7"    if ($binary eq "32");
-    $compiler_name .= " -tp p7-64" if ($binary eq "64");
-    $openmp = "-mp";
-    $defined = 1;
-}
-
-if ($compiler eq "IBM") {
-    $compiler_name .= " -q32"  if ($binary eq "32");
-    $compiler_name .= " -q64"  if ($binary eq "64");
-    $openmp = "-qsmp=omp";
-    $defined = 1;
-}
-
-if ($compiler eq "INTEL") {
-    $openmp = "-openmp";
-}
-
-if ($compiler eq "PATHSCALE") {
-    $openmp = "-mp";
-}
-
-if ($compiler eq "OPEN64") {
-    $openmp = "-mp";
-}
-
-if ($compiler eq "CLANG") {
-    $openmp = "-fopenmp";
-}
-
-if ($compiler eq "GCC" || $compiler eq "LSB") {
-    $openmp = "-fopenmp";
-}
-
-if ($compiler eq "FUJITSU") {
-    $openmp = "-Kopenmp";
-}
-
-if ($defined == 0) {
-    $compiler_name .= " -m32" if ($binary eq "32");
-    $compiler_name .= " -m64" if ($binary eq "64");
-}
-
-# Do again
-
-$data = `$compiler_name $flags -E ctest.c`;
-
-if ($?) {
-    printf STDERR "C Compiler ($compiler_name) is something wrong.\n";
-    die 1;
-}
-
-$have_msa = 0;
-if (($architecture eq "mips") || ($architecture eq "mips64")) {
-    eval "use File::Temp qw(tempfile)";
-    if ($@){ 
-	warn "could not load PERL module File::Temp, so could not check MSA capatibility";
-    } else {
-	$tmpf = new File::Temp( SUFFIX => '.c' , UNLINK => 1 );
-	$code = '"addvi.b $w0, $w1, 1"';
-	$msa_flags = "-mmsa -mfp64 -mload-store-pairs";
-	print $tmpf "#include <msa.h>\n\n";
-	print $tmpf "void main(void){ __asm__ volatile($code); }\n";
-
-	$args = "$msa_flags -o $tmpf.o $tmpf";
-	my @cmd = ("$compiler_name $flags $args >/dev/null 2>/dev/null");
-	system(@cmd) == 0;
-	if ($? != 0) {
-	    $have_msa = 0;
-	} else {
-	    $have_msa = 1;
-	}
-	unlink("$tmpf.o");
-    }
-}
-
-$architecture = x86          if ($data =~ /ARCH_X86/);
-$architecture = x86_64       if ($data =~ /ARCH_X86_64/);
-$architecture = e2k          if ($data =~ /ARCH_E2K/);
-$architecture = power        if ($data =~ /ARCH_POWER/);
-$architecture = mips         if ($data =~ /ARCH_MIPS/);
-$architecture = mips64       if ($data =~ /ARCH_MIPS64/);
-$architecture = alpha        if ($data =~ /ARCH_ALPHA/);
-$architecture = sparc        if ($data =~ /ARCH_SPARC/);
-$architecture = ia64         if ($data =~ /ARCH_IA64/);
-$architecture = arm          if ($data =~ /ARCH_ARM/);
-$architecture = arm64        if ($data =~ /ARCH_ARM64/);
-$architecture = zarch        if ($data =~ /ARCH_ZARCH/);
-$architecture = loongarch64  if ($data =~ /ARCH_LOONGARCH64/);
-
-$binformat    = bin32;
-$binformat    = bin64  if ($data =~ /BINARY_64/);
-
-$no_avx512= 0;
-if (($architecture eq "x86") || ($architecture eq "x86_64")) {
-    eval "use File::Temp qw(tempfile)";
-    if ($@){ 
-	warn "could not load PERL module File::Temp, so could not check compiler compatibility with AVX512";
-	$no_avx512 = 0;
-    } else {
-#	$tmpf = new File::Temp( UNLINK => 1 );
-	($fh,$tmpf) = tempfile( SUFFIX => '.c' , UNLINK => 1 );
-	$code = '"vbroadcastss -4 * 4(%rsi), %zmm2"';
-	print $fh "#include <immintrin.h>\n\nint main(void){ __asm__ volatile($code); }\n";
-	$args = " -march=skylake-avx512 -c -o $tmpf.o $tmpf";
-	if ($compiler eq "PGI") {
-	    $args = " -tp skylake -c -o $tmpf.o $tmpf";
-	}
-	my @cmd = ("$compiler_name $flags $args >/dev/null 2>/dev/null");
-	system(@cmd) == 0;
-	if ($? != 0) {
-	    $no_avx512 = 1;
-	} else {
-	    $no_avx512 = 0;
-	}
-	unlink("$tmpf.o");
-    }
-}
-
-$no_rv64gv= 0;
-if (($architecture eq "riscv64")) {
-    eval "use File::Temp qw(tempfile)";
-    if ($@){ 
-	warn "could not load PERL module File::Temp, so could not check compiler compatibility with the RISCV vector extension";
-	$no_rv64gv = 0;
-    } else {
-#	$tmpf = new File::Temp( UNLINK => 1 );
-	($fh,$tmpf) = tempfile( SUFFIX => '.c' , UNLINK => 1 );
-	$code = '"vsetvli    zero, zero, e8, m1\n"';
-	print $fh "int main(void){ __asm__ volatile($code); }\n";
-	$args = " -march=rv64gv -c -o $tmpf.o $tmpf";
-	my @cmd = ("$compiler_name $flags $args >/dev/null 2>/dev/null");
-	system(@cmd) == 0;
-	if ($? != 0) {
-	    $no_rv64gv = 1;
-	} else {
-	    $no_rv64gv = 0;
-	}
-	unlink("$tmpf.o");
-    }
-}
-
-$c11_atomics = 0;
-if ($data =~ /HAVE_C11/) {
-    eval "use File::Temp qw(tempfile)";
-    if ($@){ 
-       warn "could not load PERL module File::Temp, so could not check compiler compatibility with C11";
-       $c11_atomics = 0;
-    } else {
-       ($fh,$tmpf) = tempfile( SUFFIX => '.c' , UNLINK => 1 );
-       print $fh "#include <stdatomic.h>\nint main(void){}\n";
-       $args = " -c -o $tmpf.o $tmpf";
-       my @cmd = ("$compiler_name $flags $args >/dev/null 2>/dev/null");
-       system(@cmd) == 0;
-       if ($? != 0) {
-           $c11_atomics = 0;
-       } else {
-           $c11_atomics = 1;
-       }
-       unlink("$tmpf.o");
-    }
-}
-
-if ($compiler eq "GCC" &&( ($architecture eq "x86") || ($architecture eq "x86_64"))) {
-	$no_avx2 = 0;
-	$oldgcc = 0;
-	$data = `$compiler_name -dumpversion`;
-	if ($data <= 4.6) {
-		$no_avx2 = 1;
-		$oldgcc = 1;
-	}
-}
-
-$data = `$compiler_name $flags -S ctest1.c && grep globl ctest1.s | head -n 1 && rm -f ctest1.s`;
-
-$data =~ /globl\s([_\.]*)(.*)/;
-
-$need_fu      = $1;
-
-$cross = 0;
-
-if ($architecture ne $hostarch) {
-    $cross = 1;
-    $cross = 0 if (($hostarch eq "x86_64") && ($architecture eq "x86"));
-    $cross = 0 if (($hostarch eq "mips64") && ($architecture eq "mips"));
-}
-
-$cross = 1 if ($os ne $hostos);
-$cross = 0 if (($os eq "Android") && ($hostos eq "Linux") && ($ENV{TERMUX_APP_PID} != ""));
-
-$openmp = "" if $ENV{USE_OPENMP} != 1;
-
-$linker_L = "";
-$linker_l = "";
-$linker_a = "";
-
-{
-    $link = `$compiler_name $flags -c ctest2.c -o ctest2.o 2>&1 && $compiler_name $flags $openmp -v ctest2.o -o ctest2 2>&1 && rm -f ctest2.o ctest2 ctest2.exe`;
-
-    $link =~ s/\-Y\sP\,/\-Y/g;
-
-    @flags = split(/[\s\,\n]/, $link);
-    # remove leading and trailing quotes from each flag.
-    @flags = map {s/^['"]|['"]$//g; $_} @flags;
-
-    foreach $flags (@flags) {
-	if (
-	    ($flags =~ /^\-L/)
-	    && ($flags !~ /^-LIST:/)
-	    && ($flags !~ /^-LANG:/)
-	    ) {
-	    $linker_L .= $flags . " "
-	    }
-
-	if ($flags =~ /^\-Y/) {
-	    $linker_L .= "-Wl,". $flags . " "
-	    }
-
-	if ($flags =~ /^\--exclude-libs/) {
-	    $linker_L .= "-Wl,". $flags . " ";
-	    $flags="";
-	   }
-
-	if (
-	    ($flags =~ /^\-l/)
-	    && ($flags !~ /gfortranbegin/)
-	    && ($flags !~ /frtbegin/)
-	    && ($flags !~ /pathfstart/)
-	    && ($flags !~ /numa/)
-	    && ($flags !~ /crt[0-9]/)
-	    && ($flags !~ /gcc/)
-	    && ($flags !~ /user32/)
-	    && ($flags !~ /kernel32/)
-	    && ($flags !~ /advapi32/)
-	    && ($flags !~ /shell32/)
-	    && ($flags !~ /omp/)
-	    && ($flags !~ /[0-9]+/)
-	    ) {
-	    $linker_l .= $flags . " "
-	}
-
-	$linker_a .= $flags . " " if $flags =~ /\.a$/;
-    }
-
-}
-
-open(MAKEFILE, "> $makefile") || die "Can't create $makefile";
-open(CONFFILE, "> $config"  ) || die "Can't create $config";
-
-# print $data, "\n";
-
-print MAKEFILE "OSNAME=$os\n";
-print MAKEFILE "ARCH=$architecture\n";
-print MAKEFILE "C_COMPILER=$compiler\n";
-print MAKEFILE "BINARY32=\n" if $binformat ne bin32;
-print MAKEFILE "BINARY64=\n" if $binformat ne bin64;
-print MAKEFILE "BINARY32=1\n" if $binformat eq bin32;
-print MAKEFILE "BINARY64=1\n" if $binformat eq bin64;
-print MAKEFILE "FU=$need_fu\n" if $need_fu ne "";
-print MAKEFILE "CROSS_SUFFIX=$cross_suffix\n" if $cross != 0 && $cross_suffix ne "";
-print MAKEFILE "CROSS=1\n" if $cross != 0;
-print MAKEFILE "CEXTRALIB=$linker_L $linker_l $linker_a\n";
-print MAKEFILE "HAVE_MSA=1\n" if $have_msa eq 1;
-print MAKEFILE "MSA_FLAGS=$msa_flags\n" if $have_msa eq 1;
-print MAKEFILE "NO_RV64GV=1\n" if $no_rv64gv eq 1;
-print MAKEFILE "NO_AVX512=1\n" if $no_avx512 eq 1;
-print MAKEFILE "NO_AVX2=1\n" if $no_avx2 eq 1;
-print MAKEFILE "OLDGCC=1\n" if $oldgcc eq 1;
-
-$os           =~ tr/[a-z]/[A-Z]/;
-$architecture =~ tr/[a-z]/[A-Z]/;
-$compiler     =~ tr/[a-z]/[A-Z]/;
-
-print CONFFILE "#define OS_$os\t1\n";
-print CONFFILE "#define ARCH_$architecture\t1\n";
-print CONFFILE "#define C_$compiler\t1\n";
-print CONFFILE "#define __32BIT__\t1\n"  if $binformat eq bin32;
-print CONFFILE "#define __64BIT__\t1\n"  if $binformat eq bin64;
-print CONFFILE "#define FUNDERSCORE\t$need_fu\n" if $need_fu ne "";
-print CONFFILE "#define HAVE_MSA\t1\n"  if $have_msa eq 1;
-print CONFFILE "#define HAVE_C11\t1\n" if $c11_atomics eq 1;
-
-
-if ($os eq "LINUX") {
-
-#    @pthread = split(/\s+/, `nm /lib/libpthread.so* | grep _pthread_create`);
-
-#    if ($pthread[2] ne "") {
-#	print CONFFILE "#define PTHREAD_CREATE_FUNC	$pthread[2]\n";
-#    } else {
-	print CONFFILE "#define PTHREAD_CREATE_FUNC	pthread_create\n";
-#    }
-} else {
-    print CONFFILE "#define PTHREAD_CREATE_FUNC	pthread_create\n";
-}
-
-close(MAKEFILE);
-close(CONFFILE);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zhang Xianyi	5f998efd7b	Merge pull request #1247 from martin-frbg/revert-cgroups-pr Revert #1246, "honor cgroup/cpuset limits" for now	2017-07-25 16:09:55 +08:00
Martin Kroeker	88a35ff457	Revert #1246 , "honor cgroup/cpuset limits" for now Unsafe usage of the __GLIBC_PREREQ macro lead to build breakage on non-glibc systems	2017-07-25 08:39:35 +02:00