chg: dev: cleanup windows builds and sources, update workflows

* add win32 defines ABC_NO_DYNAMIC_LINKING, WIN32
* static_cast => uint returns in acbTest.c !refactor
* check for win first, win/mingw definitions inside if(msys or mingw)
* fix missing leading ddunder on mingw32__
* switch msys env for clang64, re-enable readline
* cleanup cmake type checks and workflow env
* mingw clang-64 thinks sizeof long is 4
* use abc typedefs instead of hard-coded types

Signed-off-by: Stephen L Arnold <nerdboy@gentoo.org>

Author: Stephen L Arnold

.github/workflows/ci.yml

@@ -26,25 +26,42 @@ jobs:
 
         name: [
           ubuntu-20.04-gcc,
+          ubuntu-20.04-clang,
           ubuntu-18.04-gcc,
           macOS-10.15-gcc,
+          macOS-10.15-clang,
         ]
 
         include:
           - name: ubuntu-20.04-gcc
             os: ubuntu-20.04
             compiler: gcc
             version: "10"
+            toxcmd: build
+
+          - name: ubuntu-20.04-clang
+            os: ubuntu-20.04
+            compiler: clang
+            version: "10"
+            toxcmd: clang
 
           - name: ubuntu-18.04-gcc
             os: ubuntu-18.04
             compiler: gcc
             version: "9"
+            toxcmd: abc,tests
 
           - name: macOS-10.15-gcc
             os: macOS-10.15
             compiler: gcc
-            version: "10"
+            version: "11"
+            toxcmd: ctest
+
+          - name: macOS-10.15-clang
+            os: macOS-10.15
+            compiler: xcode
+            version: "12.3"
+            toxcmd: clang
 
     steps:
     - uses: actions/checkout@v2
@@ -81,7 +98,7 @@ jobs:
         CC: ${{ env.CC }}
         CXX: ${{ env.CXX }}
       run: |
-        tox -e build
+        tox -e ${{ matrix.toxcmd }}
 
     - name:  Install and setup MacOS packages
       if: runner.os == 'macOS'
@@ -103,4 +120,4 @@ jobs:
         CC: ${{ env.CC }}
         CXX: ${{ env.CXX }}
       run: |
-        tox -e ctest
+        tox -e ${{ matrix.toxcmd }}

.github/workflows/win.yml

@@ -0,0 +1,64 @@
+name: msystem
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  msys2-build:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include: [
+          { msystem: MINGW64,  arch: x86_64 },
+          { msystem: CLANG64,  arch: clang-x86_64 },
+          { msystem: MINGW32,  arch: i686   },
+        ]
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup MinGW native environment
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        update: false
+        install: >-
+          git
+          make
+          mingw-w64-${{ matrix.arch }}-toolchain
+          mingw-w64-${{ matrix.arch }}-cmake
+          mingw-w64-${{ matrix.arch }}-ninja
+          mingw-w64-${{ matrix.arch }}-pkgconf
+          mingw-w64-${{ matrix.arch }}-readline
+
+    - run: >-
+        cmake
+        -Wdev
+        -B build
+        -DBUILD_SHARED_LIBS=ON
+        -DABC_USE_NAMESPACE=xxx
+        -DCMAKE_BUILD_TYPE=Debug
+        -DCMAKE_INSTALL_PREFIX=$PWD/_dist
+
+    - name: CMake build
+      run: |
+        cmake --build build --parallel
+
+    - name: Test
+      run: ctest --test-dir build --output-on-failure --parallel -V
+
+    - uses: actions/upload-artifact@v1
+      if: failure()
+      with:
+        name: WindowsCMakeTestlog
+        path: build/Testing/Temporary/LastTest.log
+
+    - name: Install project
+      run: cmake --install build

CMakeLists.txt

@@ -140,10 +140,14 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     )
 endif()
 if(WIN32)
+    if(MINGW OR MSYS)
+        add_definitions(-DWIN32 -D__MINGW32__)
+    endif()
     target_compile_definitions(abc_interface
         INTERFACE
             $<$<BOOL:${BUILD_SHARED_LIBS}>:ABC_DLL=ABC_DLLEXPORT>
             $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:WIN32_NO_DLL>
+            $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:ABC_NO_DYNAMIC_LINKING>
     )
 endif()
 
@@ -155,18 +159,19 @@ else()
 endif()
 
 include(CheckTypeSize)
-check_type_size("(void*)0" SIZEOF_VOID_P)
 
 if(ABC_USE_STDINT_H)
+    check_type_size("void*" SIZEOF_VOID_P LANGUAGE C)
     message(STATUS "Setting ABC_USE_STDINT_H ${ABC_USE_STDINT_H}")
     target_compile_definitions(abc_interface INTERFACE "ABC_USE_STDINT_H=1")
 else()
-    check_type_size("(long)0" SIZEOF_LONG)
-    check_type_size("(int)0" SIZEOF_INT)
-    if(UNIX OR APPLE)
-        set(ARCH_PREFIX "LIN")
-    elseif(WIN32)
+    check_type_size("void*" SIZEOF_VOID_P LANGUAGE CXX)
+    check_type_size(long SIZEOF_LONG LANGUAGE CXX)
+    check_type_size(int SIZEOF_INT LANGUAGE CXX)
+    if(WIN32 OR MINGW OR MSYS)
         set(ARCH_PREFIX "NT")
+    elseif(UNIX OR APPLE)
+        set(ARCH_PREFIX "LIN")
     else()
         message(FATAL_ERROR "Unknown arch")
     endif()
@@ -184,6 +189,7 @@ else()
         "${ARCH_PREFIX}${ARCH_SUFFIX}"
     )
 endif()
+
 if(CMAKE_SYSTEM_PROCESS STREQUAL "arm")
     target_compile_definitions(abc_interface INTERFACE
         ABC_MEMALIGN=4
@@ -260,7 +266,7 @@ if(NOT ABC_USE_NO_PTHREADS)
         set(THREADS_PREFER_PTHREAD_FLAG ON)
         find_package(Threads REQUIRED)
         target_link_libraries(abc_interface
-            INTERFACE Threads::Threads
+            INTERFACE ${CMAKE_THREAD_LIBS_INIT}
         )
     endif()
 endif()
@@ -286,7 +292,7 @@ define_property(GLOBAL
 define_property(GLOBAL
     PROPERTY ABC_SOURCES
     BRIEF_DOCS "Sources of executables of abc"
-    FULL_DOCS "All source files of libabc"
+    FULL_DOCS "All source files of abc"
 )
 
 function(abc_libabc_add_sources)
@@ -342,6 +348,7 @@ if(BUILD_SHARED_LIBS)
     set_target_properties(
         libabc PROPERTIES VERSION ${LIBRARY_VERSION}
                           SOVERSION ${LIBRARY_SOVERSION}
+                          WINDOWS_EXPORT_ALL_SYMBOLS TRUE
     )
 endif()
 

Makefile

@@ -167,7 +167,7 @@ CXXFLAGS += $(CFLAGS)
 $(info $(MSG_PREFIX)Using CXXFLAGS=$(CXXFLAGS))
 
 SRC  :=
-GARBAGE := core core.* *.stackdump ./tags $(PROG) demo arch_flags
+GARBAGE := core core.* *.stackdump ./tags $(PROG) demo arch_flags result.blif
 
 .PHONY: all default tags clean docs cmake_info
 

src/aig/aig/aigPart.c

@@ -309,7 +309,7 @@ Vec_Ptr_t * Aig_ManSupports( Aig_Man_t * pMan )
         {
             pPart0 = (Part_One_t *)Aig_ObjFanin0(pObj)->pData;
             vSupp = Part_ManTransferEntry(pPart0);
-            Vec_IntPush( vSupp, (int)(long)pObj->pNext );
+            Vec_IntPush( vSupp, (int)(ABC_PTRINT_T)pObj->pNext );
             Vec_PtrPush( vSupports, vSupp );
             assert( pPart0->nRefs > 0 );
             if ( --pPart0->nRefs == 0 )
@@ -321,7 +321,7 @@ Vec_Ptr_t * Aig_ManSupports( Aig_Man_t * pMan )
             if ( pObj->nRefs )
             {
                 pPart0 = Part_ManFetchEntry( p, 1, pObj->nRefs );
-                pPart0->pOuts[ pPart0->nOuts++ ] = (int)(long)pObj->pNext;
+                pPart0->pOuts[ pPart0->nOuts++ ] = (int)(ABC_PTRINT_T)pObj->pNext;
                 pObj->pData = pPart0;
             }
             continue;
@@ -972,7 +972,7 @@ Aig_Obj_t * Aig_ManDupPart_rec( Aig_Man_t * pNew, Aig_Man_t * pOld, Aig_Obj_t *
     if ( Aig_ObjIsCi(pObj) )
     {
         assert( Vec_IntSize(vSuppMap) == Aig_ManCiNum(pNew) );
-        Vec_IntPush( vSuppMap, (int)(long)pObj->pNext );
+        Vec_IntPush( vSuppMap, (int)(ABC_PTRINT_T)pObj->pNext );
         return (Aig_Obj_t *)(pObj->pData = Aig_ObjCreateCi(pNew));
     }
     assert( Aig_ObjIsNode(pObj) );

src/base/acb/acbTest.c

@@ -235,7 +235,7 @@ void Gia_ManDualMux( Gia_Man_t * p, int LitC[2], int LitT[2], int LitE[2], int L
 
     if ( fForceZero ) LitZ[0]   = Gia_ManHashAnd( p, LitZ[0], Abc_LitNot(LitZ[1]) );
 }
-int Gia_ManDualCompare( Gia_Man_t * p, int LitF[2], int LitS[2] )
+int Gia_ManDualCompare( Gia_Man_t * p, unsigned int LitF[2], unsigned int LitS[2] )
 {
     int iMiter = Gia_ManHashXor( p, LitF[0], LitS[0] );
     iMiter = Gia_ManHashOr( p, LitF[1], iMiter );
@@ -421,8 +421,8 @@ Gia_Man_t * Acb_NtkGiaDeriveMiter( Gia_Man_t * pOne, Gia_Man_t * pTwo, int Type
     {
         for ( i = 0; i < Gia_ManCoNum(pOne); i += 2 )
         {
-            int pLitsF[2] = { static_cast<int>(Gia_ManCo(pOne, i)->Value), static_cast<int>(Gia_ManCo(pOne, i+1)->Value) };
-            int pLitsS[2] = { static_cast<int>(Gia_ManCo(pTwo, i)->Value), static_cast<int>(Gia_ManCo(pTwo, i+1)->Value) };
+            unsigned int pLitsF[2] = { Gia_ManCo(pOne, i)->Value, Gia_ManCo(pOne, i+1)->Value };
+            unsigned int pLitsS[2] = { Gia_ManCo(pTwo, i)->Value, Gia_ManCo(pTwo, i+1)->Value };
             Gia_ManAppendCo( pNew, pLitsF[0] );
             Gia_ManAppendCo( pNew, pLitsS[0] );
         }
@@ -431,8 +431,8 @@ Gia_Man_t * Acb_NtkGiaDeriveMiter( Gia_Man_t * pOne, Gia_Man_t * pTwo, int Type
     {
         for ( i = 0; i < Gia_ManCoNum(pOne); i += 2 )
         {
-            int pLitsF[2] = { static_cast<int>(Gia_ManCo(pTwo, i)->Value), static_cast<int>(Gia_ManCo(pOne, i+1)->Value) };
-            int pLitsS[2] = { static_cast<int>(Gia_ManCo(pTwo, i)->Value), static_cast<int>(Gia_ManCo(pTwo, i+1)->Value) };
+            unsigned int pLitsF[2] = { Gia_ManCo(pOne, i)->Value, Gia_ManCo(pOne, i+1)->Value };
+            unsigned int pLitsS[2] = { Gia_ManCo(pTwo, i)->Value, Gia_ManCo(pTwo, i+1)->Value };
             Gia_ManAppendCo( pNew, pLitsF[1] );
             Gia_ManAppendCo( pNew, pLitsS[1] );
         }
@@ -441,8 +441,8 @@ Gia_Man_t * Acb_NtkGiaDeriveMiter( Gia_Man_t * pOne, Gia_Man_t * pTwo, int Type
     {
         for ( i = 0; i < Gia_ManCoNum(pOne); i += 2 )
         {
-            int pLitsF[2] = { static_cast<int>(Gia_ManCo(pOne, i)->Value), static_cast<int>(Gia_ManCo(pOne, i+1)->Value) };
-            int pLitsS[2] = { static_cast<int>(Gia_ManCo(pTwo, i)->Value), static_cast<int>(Gia_ManCo(pTwo, i+1)->Value) };
+            unsigned int pLitsF[2] = { Gia_ManCo(pOne, i)->Value, Gia_ManCo(pOne, i+1)->Value };
+            unsigned int pLitsS[2] = { Gia_ManCo(pTwo, i)->Value, Gia_ManCo(pTwo, i+1)->Value };
             Gia_ManAppendCo( pNew, Gia_ManDualCompare( pNew, pLitsF, pLitsS ) );
         }
     }