From 53f53d566181696a81f767361d8c5d49eb4d4cfe Mon Sep 17 00:00:00 2001
From: msqr1 <repulseshipp@gmail.com>
Date: Thu, 10 Oct 2024 23:56:14 -0700
Subject: [PATCH] Disable fPIC for OpenBLAS, fixing OpenBLAS -O0

---
 .gitignore         |  2 +-
 src/OpenBLAS.patch | 11 ++++++++++-
 src/make           |  4 +++-
 test               | 20 +++++++++++++++-----
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7dacd72..80b3a04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@ vosk
 kaldi
 .vscode
 index.html
-OpenBLAS
+openblas
 openfst
 emsdk
 test.js
diff --git a/src/OpenBLAS.patch b/src/OpenBLAS.patch
index 260d2fe..1bcac58 100644
--- a/src/OpenBLAS.patch
+++ b/src/OpenBLAS.patch
@@ -25,7 +25,7 @@ index 9f6e48b..a6b1a3f 100644
 +#FCOMMON_OPT += -march=rv64imafdc -mabi=lp64d
  endif
 diff --git a/Makefile.system b/Makefile.system
-index b065f9a..60dbd2d 100644
+index b065f9a..b4abaff 100644
 --- a/Makefile.system
 +++ b/Makefile.system
 @@ -202,7 +202,7 @@ endif
@@ -37,6 +37,15 @@ index b065f9a..60dbd2d 100644
  endif
  endif
  
+@@ -1416,7 +1416,7 @@ ifeq ($(NEED_PIC), 1)
+ ifeq ($(C_COMPILER), IBM)
+ CCOMMON_OPT += -qpic=large
+ else
+-CCOMMON_OPT += -fPIC
++#CCOMMON_OPT += -fPIC
+ endif
+ ifeq ($(F_COMPILER), SUN)
+ FCOMMON_OPT  += -pic
 @@ -1683,7 +1683,7 @@ FCOMMON_OPT += -g
  endif
  
diff --git a/src/make b/src/make
index ea308a7..b85c66d 100755
--- a/src/make
+++ b/src/make
@@ -42,7 +42,7 @@ if [ ! -d "$OPENFST" ]; then
   git clone --depth=1 https://github.com/alphacep/openfst /tmp/openfst &&
   cd /tmp/openfst &&
   autoreconf -is &&
-  CXXFLAGS="-r -O3 -fno-rtti -flto -msimd128 -matomics -mbulk-memory -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals" emconfigure ./configure --prefix="$OPENFST" --enable-static --disable-shared --enable-lookahead-fsts --enable-ngram-fsts --disable-bin &&
+  CXXFLAGS="-r -O3 -fno-rtti -flto -msimd128 -matomics -mbulk-memory -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals" emconfigure ./configure --prefix="$OPENFST" --enable-static --disable-shared --enable-ngram-fsts --disable-bin &&
   emmake make -j"$JOBS" install &&
   echo "PACKAGE_VERSION = 1.8.0" >> "$OPENFST"/Makefile
   rm -rf /tmp/openfst
@@ -82,9 +82,11 @@ cd "$SRC" &&
 FILES="Util.o CommonModel.o Recognizer.o Bindings.o"
 COMMON_FLAGS="-O3 -flto -fno-rtti -msimd128 -matomics -mbulk-memory -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals"
 COMMON_LD_FLAGS="-sWASMFS -sWASM_BIGINT -sMODULARIZE -sTEXTDECODER=2 -sWASM_WORKERS=2 -sEVAL_CTORS=2 -sINITIAL_MEMORY=$INITIAL_MEMORY -sALLOW_MEMORY_GROWTH -sPOLYFILL=0 -sEXIT_RUNTIME=0 -sINVOKE_RUN=0 -sSUPPORT_LONGJMP=0 -sINCOMING_MODULE_JS_API=wasmMemory,instantiateWasm,wasm -sEXPORT_NAME=loadVosklet -sMALLOC=emmalloc -sENVIRONMENT=web,worker -L$KALDI/src -l:online2/kaldi-online2.a -l:decoder/kaldi-decoder.a -l:ivector/kaldi-ivector.a -l:gmm/kaldi-gmm.a -l:tree/kaldi-tree.a -l:feat/kaldi-feat.a -l:cudamatrix/kaldi-cudamatrix.a -l:lat/kaldi-lat.a -l:lm/kaldi-lm.a -l:rnnlm/kaldi-rnnlm.a -l:hmm/kaldi-hmm.a -l:nnet3/kaldi-nnet3.a -l:transform/kaldi-transform.a -l:matrix/kaldi-matrix.a -l:fstext/kaldi-fstext.a -l:util/kaldi-util.a -l:base/kaldi-base.a -L$OPENFST/lib -l:libfst.a -l:libfstngram.a -L$OPENBLAS -l:lib/libopenblas.a -L$VOSK/src -l:vosk.a -lembind --closure 1 --pre-js"
+# shellcheck disable=SC2086
 em++ ${FILES//.o/.cc} $COMMON_FLAGS -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 -DMAX_WORKERS="$MAX_THREADS" -fno-exceptions -std=c++23 -c -I. -I"$VOSK"/src &&
 
 em++ $FILES $COMMON_FLAGS $COMMON_LD_FLAGS Wrapper.js -o ../Vosklet.js
+# shellcheck disable=SC2086
 em++ $FILES $COMMON_FLAGS $COMMON_LD_FLAGS ../Examples/Wrapper.js -o ../Examples/Vosklet.js
 
 rm -f $FILES
diff --git a/test b/test
index ee0d0cd..9095989 100755
--- a/test
+++ b/test
@@ -33,15 +33,25 @@ export PATH=:$PATH:$(realpath "$EMSDK")/upstream/bin
 KALDI=$(realpath kaldi)
 VOSK=$(realpath vosk)
 OPENFST=$(realpath openfst)
-OPENBLAS=$(realpath OpenBLAS)
+OPENBLAS=$(realpath openblas)
+SRC=$(realpath src)
+
+cd "$SRC" &&
+FILES="Util.o CommonModel.o Recognizer.o Bindings.o"
+COMMON_FLAGS="-Wall -Wextra -Wpedantic -fno-rtti -msimd128 -matomics -mbulk-memory -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals"
+COMMON_CXXFLAGS="-std=c++23 -I$VOSK/src -I. -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 -DMAX_WORKERS=$MAX_THREADS"
+COMMON_LDFLAGS="-sWASMFS -sWASM_BIGINT -sMODULARIZE -sWASM_EXNREF -sTEXTDECODER=2 -sWASM_WORKERS=2 -sEVAL_CTORS=2 -sINITIAL_MEMORY=$INITIAL_MEMORY -sALLOW_MEMORY_GROWTH -sPOLYFILL=0 -sEXIT_RUNTIME=0 -sINVOKE_RUN=0 -sSUPPORT_LONGJMP=0 -sINCOMING_MODULE_JS_API=wasmMemory,instantiateWasm,wasm -sEXPORT_NAME=loadVosklet -sMALLOC=emmalloc -sENVIRONMENT=web,worker -L$KALDI/src -l:online2/kaldi-online2.a -l:decoder/kaldi-decoder.a -l:ivector/kaldi-ivector.a -l:gmm/kaldi-gmm.a -l:tree/kaldi-tree.a -l:feat/kaldi-feat.a -l:cudamatrix/kaldi-cudamatrix.a -l:lat/kaldi-lat.a -l:lm/kaldi-lm.a -l:rnnlm/kaldi-rnnlm.a -l:hmm/kaldi-hmm.a -l:nnet3/kaldi-nnet3.a -l:transform/kaldi-transform.a -l:matrix/kaldi-matrix.a -l:fstext/kaldi-fstext.a -l:util/kaldi-util.a -l:base/kaldi-base.a -L$OPENFST/lib -l:libfst.a -l:libfstngram.a -L$OPENBLAS -l:lib/libopenblas.a -L$VOSK/src -l:vosk.a -lembind --pre-js ../Examples/Wrapper.js -o ../test.js"
 
-cd src &&
 MODE=0 && # 0: Debug, 1: Optimized release
-COMMON_FLAGS="Util.cc CommonModel.cc Recognizer.cc Bindings.cc -std=c++23 -Wall -Wextra -Wpedantic -fno-rtti -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 -DMAX_WORKERS="$MAX_THREADS" -sWASMFS -sWASM_BIGINT -sMODULARIZE -sWASM_EXNREF -sTEXTDECODER=2 -sWASM_WORKERS=2 -sEVAL_CTORS=2 -sINITIAL_MEMORY="$INITIAL_MEMORY" -sALLOW_MEMORY_GROWTH -sPOLYFILL=0 -sEXIT_RUNTIME=0 -sINVOKE_RUN=0 -sINCOMING_MODULE_JS_API=wasmMemory,instantiateWasm,wasm -sEXPORT_NAME=loadVosklet -sMALLOC=emmalloc -sENVIRONMENT=web,worker -I. -I"$VOSK"/src -L"$KALDI"/src -l:online2/kaldi-online2.a -l:decoder/kaldi-decoder.a -l:ivector/kaldi-ivector.a -l:gmm/kaldi-gmm.a -l:tree/kaldi-tree.a -l:feat/kaldi-feat.a -l:cudamatrix/kaldi-cudamatrix.a -l:lat/kaldi-lat.a -l:lm/kaldi-lm.a -l:rnnlm/kaldi-rnnlm.a -l:hmm/kaldi-hmm.a -l:nnet3/kaldi-nnet3.a -l:transform/kaldi-transform.a -l:matrix/kaldi-matrix.a -l:fstext/kaldi-fstext.a -l:util/kaldi-util.a -l:base/kaldi-base.a -L"$OPENFST"/lib -l:libfst.a -l:libfstngram.a -L"$OPENBLAS" -l:lib/libopenblas.a -L"$VOSK"/src -l:vosk.a -lembind -msimd128 -matomics -mbulk-memory -mreference-types -mnontrapping-fptoint -mextended-const -msign-ext -mmutable-globals --pre-js ../Examples/Wrapper.js -o ../test.js"
 echo "Mode = $MODE" &&
 if [ "$MODE" = 0 ]; then
-  em++ $COMMON_FLAGS -O0 -sRUNTIME_DEBUG -sDISABLE_EXCEPTION_CATCHING=0 -sSTACK_OVERFLOW_CHECK=2 -sASSERTIONS=2 -g3
+  # shellcheck disable=SC2086
+  em++ ${FILES//.o/.cc} $COMMON_FLAGS $COMMON_CXXFLAGS -O0 &&
+  em++ $FILES $COMMON_FLAGS $COMMON_LDFLAGS -O0 -v -sERROR_ON_WASM_CHANGES_AFTER_LINK
 elif [ "$MODE" = 1 ]; then
-  em++ $COMMON_FLAGS -O3 --closure 1 &&
+  # shellcheck disable=SC2086
+  em++ ${FILES//.o/.cc} $COMMON_FLAGS $COMMON_CXXFLAGS -O3 -fno-exceptions -flto -c &&
+  em++ $FILES $COMMON_FLAGS $COMMON_LDFLAGS -O3 -flto --closure 1 &&
   tr -d '\n' < ../test.js | tr -s ' ' > /tmp/hehe && mv /tmp/hehe ../test.js
 fi
+rm -f $FILES
\ No newline at end of file