From 970d48f90cac50ea8f7fd6a7a152455fdf648acc Mon Sep 17 00:00:00 2001
From: blueloveTH <blueloveTH@foxmail.com>
Date: Sun, 9 Apr 2023 16:34:13 +0800
Subject: [PATCH] up

Update main.yml

Update main.yml

Update main.yml

up

up
---
 .github/workflows.rar      | Bin 1227 -> 0 bytes
 .github/workflows/main.yml | 126 +++++++++++++++++++++++++++++++++++++
 build.py                   |   2 +-
 run_profile.sh             |   1 -
 run_profile_test.sh        |  10 +++
 src/common.h               |   1 +
 src/vm.h                   |  10 +--
 7 files changed, 143 insertions(+), 7 deletions(-)
 delete mode 100644 .github/workflows.rar
 create mode 100644 .github/workflows/main.yml
 create mode 100644 run_profile_test.sh

diff --git a/.github/workflows.rar b/.github/workflows.rar
deleted file mode 100644
index 81c8ec1d2a4878c49d57e099b87ee5ce03c0e574..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1227
zcmV;+1T_0nVR9iF2LS-{;ezW60R;yD1_1$pfPesRB3rO80s{-q2n5j|pg<WzByWHN
z01|g^a%*O6Z+CMqZDDC{E_rQi3IhVD%BHV?Vc7xB+DZg4Wi&HGKQ#tl{`gi1D2xj(
zC3bAPU|=vUn>1}=!1P%j+9;xgF(rw$TIq`tQMoMlh~C~}#fzo%Ytg%J;`lRcHn5&y
zJSPb_{CM>6oIMy%Ilw*ullUW^ArYZI5;r^WJINeaN&HDVGyQ}ga6r_j_s(=p{PKTM
zwv0T4s5@T=;-^6MEb$<;?UIGq{sYbfOp(e~KMx`*4pIi7OaL>JJ_pdtna<{j=bP}O
znQQ7Jdyh2o6QD7o%%tRA;Q6DJp_(@#!IV-Iu6+jgm0`p7Z1`8^Jy3Z-no2o->k-J3
z%fW&WlTSaQ>)WC@WDv9VJp_1h9El`h;It`-4S(IHR-o(+|1zXo15I(~b_hKKox1>s
zL$Asa2)Ib}gX1d<&Yw>^OEPxH04XDLK#T@M2hx7>KInn=dw+#zk_gP{O(@jzQLl!t
z&AAMnD{I`C{gD9#%D#N6TP{SQ$zPIS=1NABL`V`v-T%~hoX-e;XxVWax3j9G9ld>>
zy^3l4N~Mnq9nr6F>V!=Jq$ykc6c=Oj@aji19ISclsg=Kq;gUlu(TF4u0N51FsU{1g
z@6;}R?N>@v%J@Lzge@E@+r3#kRS0(3w^W;To&c@WQpYp(?wCuP&Ps2NqQY$~=Fe1C
zT+fEY?T5j$09)E`Old;dnrv_5ngamc)HcQH=Tx7t+bBF#T4D8L%lUSCn#<Su^yC4)
zub0SxoC$%dhAt^5&*!jx<hj&YVDtt^eWqfQ79wCyMDP>K<*jgIJf!LULpjc8P|PNN
zEFLjy>Y>rcQ|bR+wZHDmN=FVx+QB`QCW+mQA0(KM{U$KR5p@%_x#sf}IST3MUY=Cy
zUy+-B^0c6_btl5hGQn+D`bkbcM&Ksbi7wcj{SwSJBR_%Vile7Bm$|izsrbvWwQ?z<
z9m?(>PihIk=`W5D!Xw{`|KHP*qIOu{cMYZ{_UP_iFL!h;13+cQffPo|&;`MXDQemQ
z<@C#bR*zMQuIBJ_Fg^XaErbr>dWhrs&461oa31Qk^yU=IAo=Vi(<c_#8mnyByLVPL
zs^ZF;1C0h`{RVBjcOe{fVE;a0e|5#opGXi9pK%W>fkq1SB&L87`GxU>d5Smpqr}Cp
zI~PcqdfWG%%3x<&k(E;=kB}-&8uNb4>gTchEIj^#(djoBEa}C5kH3l^wP#gkjxUSg
z0{hb%$Xg!;l<)?G9g1W~gr<f|jmjxOPjuF7>C?EoD&HI77TN$X>6PkRJQD43S9&p5
zwc-q$(LL<UsmI5csvF#vw_&(N9Ck(a@1<E9-dUSGD%ocD@x2IjMvbgzl$XL|Bf#Jp
zPv%!M+zT~O^|ks&r%tR9I5~1EuvyX9>*;IVkE<hC$A(O}^8Wa|o=Zt_<mzkN)B1K}
zA6~p!I`1g_eV)$0*-7pi#U<5<mVK(Edkw4(fI1OwjGisdw`CPvtbOn-fg}P03jhTG
pkU#(c004jh010<*a%*O6Z+CMF0|KbZrmuiu*#RAQR#5{51ONj-RY(8;

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 00000000..b23cb7b1
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,126 @@
+name: build
+on: [push, pull_request]
+jobs:
+  build_win:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ilammy/msvc-dev-cmd@v1
+    - name: Compile
+      shell: bash
+      run: |
+        python3 build.py windows
+        python3 build.py windows -lib
+        mkdir -p output/windows/x86_64
+        cp pocketpy.exe output/windows/x86_64
+        cp pocketpy.dll output/windows/x86_64
+    - uses: actions/upload-artifact@v3
+      with:
+        path: output
+    - name: Unit Test
+      run: python3 scripts/run_tests.py
+    - name: Benchmark
+      run: python3 scripts/run_tests.py benchmark
+  build_linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup Clang
+      uses: egor-tensin/setup-clang@v1
+      with:
+        version: 15
+        platform: x64
+    - name: Install libc++
+      run: sudo apt install -y libc++-15-dev libc++1-15 libc++abi-15-dev libc++abi1-15 libclang-rt-15-dev
+    # - name: Coverage Test
+    #   run: |
+    #     python3 preprocess.py
+    #     bash run_tests.sh
+    # - uses: actions/upload-artifact@v3
+    #   with:
+    #     name: coverage
+    #     path: .coverage
+    - name: Compile
+      run: |
+        python3 build.py linux
+        python3 build.py linux -lib
+        mkdir -p output/linux/x86_64
+        cp pocketpy output/linux/x86_64
+        cp pocketpy.so output/linux/x86_64
+    - uses: actions/upload-artifact@v3
+      with:
+        path: output
+    - name: Unit Test
+      run: python3 scripts/run_tests.py
+    - name: Benchmark
+      run: python3 scripts/run_tests.py benchmark
+  build_macos:
+      runs-on: macos-latest
+      steps:
+      - uses: actions/checkout@v3
+      - run: |
+          python3 amalgamate.py
+          cd plugins/macos/pocketpy
+          mkdir -p output/macos
+          xcodebuild clean build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
+          cp -r build/Release/pocketpy.bundle output/macos
+      - uses: actions/upload-artifact@v3
+        with:
+          path: plugins/macos/pocketpy/output
+  build_android:
+      runs-on: ubuntu-latest
+      steps:
+      - uses: actions/checkout@v3
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.3.0'
+          channel: 'stable'
+          cache: true
+      - run: flutter --version
+      - name: Compile
+        run: |
+          python3 amalgamate.py
+          cd plugins/flutter/example
+          flutter build apk --split-debug-info=.debug-info --split-per-abi
+          cd build/app/outputs/flutter-apk
+          mkdir -p output/android/arm64-v8a
+          mkdir -p output/android/armeabi-v7a
+          mkdir -p output/android/x86_64
+          unzip -q app-arm64-v8a-release.apk -d tmp
+          mv tmp/lib/arm64-v8a/libpocketpy.so output/android/arm64-v8a/libpocketpy.so
+          rm -rf tmp
+          unzip -q app-armeabi-v7a-release.apk -d tmp
+          mv tmp/lib/armeabi-v7a/libpocketpy.so output/android/armeabi-v7a/libpocketpy.so
+          rm -rf tmp
+          unzip -q app-x86_64-release.apk -d tmp
+          mv tmp/lib/x86_64/libpocketpy.so output/android/x86_64/libpocketpy.so
+          rm -rf tmp
+      - uses: actions/upload-artifact@v3
+        with:
+          path: plugins/flutter/example/build/app/outputs/flutter-apk/output
+  build_web:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup emsdk
+      uses: mymindstorm/setup-emsdk@v12
+      with:
+        version: 3.1.25
+        actions-cache-folder: 'emsdk-cache'
+    - name: Verify emsdk
+      run: emcc -v
+    - name: Compile
+      run: |
+        mkdir -p output/web/lib
+        python3 build.py web
+        cp web/lib/* output/web/lib
+    - uses: crazy-max/ghaction-github-pages@v3
+      with:
+        target_branch: gh-pages
+        build_dir: web
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    - uses: actions/upload-artifact@v3
+      with:
+        path: output
\ No newline at end of file
diff --git a/build.py b/build.py
index 42f3de6a..f186572f 100644
--- a/build.py
+++ b/build.py
@@ -20,7 +20,7 @@ def lib_pre_build():
 def lib_post_build():
     os.remove("src/tmp.cpp")
 
-windows_common = "clang-cl.exe -std:c++17 /utf-8 -GR- -EHsc -O2 -Wno-deprecated-declarations"
+windows_common = "CL -std:c++17 /utf-8 -GR- -EHsc -O2"
 windows_cmd = windows_common + " -Fe:pocketpy src/main.cpp"
 windows_lib_cmd = windows_common + " -LD -Fe:pocketpy src/tmp.cpp"
 
diff --git a/run_profile.sh b/run_profile.sh
index 652107c4..c7bea6c3 100644
--- a/run_profile.sh
+++ b/run_profile.sh
@@ -1,4 +1,3 @@
-# THIS SCRIPT IS NOT WORKING
 clang++ -pg -O2 -std=c++17 -fno-rtti -stdlib=libc++ -Wall -o pocketpy src/main.cpp
 time ./pocketpy benchmarks/fib.py
 mv benchmarks/gmon.out .
diff --git a/run_profile_test.sh b/run_profile_test.sh
new file mode 100644
index 00000000..9d7ccc71
--- /dev/null
+++ b/run_profile_test.sh
@@ -0,0 +1,10 @@
+clang++ -O2 -std=c++17 -fno-rtti --coverage -stdlib=libc++ -Wall -o pocketpy src/main.cpp
+time ./pocketpy benchmarks/fib.py
+rm -rf .coverage
+mkdir -p .coverage
+llvm-cov-15 gcov main.gc -r -s src/ >> .coverage/coverage.txt
+mv *.gcov .coverage
+rm main.gc*
+
+# -fprofile-instr-generate -fcoverage-mapping 
+# llvm-cov-15 show main.gc -instr-profile=default.profraw -format=html -output-dir .coverage
\ No newline at end of file
diff --git a/src/common.h b/src/common.h
index e9ce5ecf..5e9661f6 100644
--- a/src/common.h
+++ b/src/common.h
@@ -3,6 +3,7 @@
 #ifdef _MSC_VER
 #pragma warning (disable:4267)
 #pragma warning (disable:4101)
+#pragma warning (disable:4244)
 #define _CRT_NONSTDC_NO_DEPRECATE
 #define strdup _strdup
 #endif
diff --git a/src/vm.h b/src/vm.h
index e294a538..f4eb40e0 100644
--- a/src/vm.h
+++ b/src/vm.h
@@ -204,9 +204,9 @@ public:
     PyObject* new_type_object(PyObject* mod, StrName name, Type base){
         PyObject* obj = heap._new<Type>(tp_type, _all_types.size());
         PyTypeInfo info{
-            .obj = obj,
-            .base = base,
-            .name = (mod!=nullptr && mod!=builtins) ? Str(OBJ_NAME(mod)+"."+name.sv()): name.sv()
+            obj,
+            base,
+            (mod!=nullptr && mod!=builtins) ? Str(OBJ_NAME(mod)+"."+name.sv()): name.sv()
         };
         if(mod != nullptr) mod->attr().set(name, obj);
         _all_types.push_back(info);
@@ -626,8 +626,8 @@ inline Str VM::disassemble(CodeObject_ co){
 }
 
 inline void VM::init_builtin_types(){
-    _all_types.push_back({.obj = heap._new<Type>(Type(1), Type(0)), .base = -1, .name = "object"});
-    _all_types.push_back({.obj = heap._new<Type>(Type(1), Type(1)), .base = 0, .name = "type"});
+    _all_types.push_back({heap._new<Type>(Type(1), Type(0)), -1, "object"});
+    _all_types.push_back({heap._new<Type>(Type(1), Type(1)), 0, "type"});
     tp_object = 0; tp_type = 1;
 
     tp_int = _new_type_object("int");