patrick/Vosklet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS Optimization

Browse Source
This commit is contained in:
msqr1
2024-02-07 22:13:36 -08:00
parent bf65aebe69
commit b7f050ffa9
9 changed files with 144 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

181
devel/BrowserRecognizer.js
View File

File diff suppressed because one or more lines are too long

2
src/Makefile
View File

@@ -20,7 +20,7 @@ CLAPACK_WASM:=$(realpath clapack-wasm)
BrowserRecognizer.js: | vosk libarchive
cd $(SRC) && \
em++ -O3 global.cc genericModel.cc model.cc spkModel.cc recognizer.cc bindings.cc -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sTRUSTED_TYPES -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$MAX_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPOLYFILL=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc,_main -sEXPORT_NAME=loadBR -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$LIBARCHIVE/include -I$VOSK/src -L$LIBARCHIVE/lib -larchive -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$CLAPACK_WASM -l:CBLAS/lib/cblas.a -l:CLAPACK-3.2.1/lapack.a -l:CLAPACK-3.2.1/libcblaswr.a -l:f2c_BLAS-3.8.0/blas.a -l:libf2c/libf2c.a -L$VOSK/src -l:vosk.a -lopfs.js -lembind -pthread -flto --pre-js pre.js -o ../BrowserRecognizer.js && \
em++ -O3 global.cc genericModel.cc model.cc spkModel.cc recognizer.cc bindings.cc -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sMODULARIZE -sTRUSTED_TYPES -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$(MAX_MEMORY) -sPTHREAD_POOL_SIZE=$(MAX_THREADS) -sPOLYFILL=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc,_main -sEXPORT_NAME=loadBR -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$(LIBARCHIVE)/include -I$(VOSK)/src -L$(LIBARCHIVE)/lib -larchive -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$(CLAPACK_WASM) -l:CBLAS/lib/cblas.a -l:CLAPACK-3.2.1/lapack.a -l:CLAPACK-3.2.1/libcblaswr.a -l:f2c_BLAS-3.8.0/blas.a -l:libf2c/libf2c.a -L$(VOSK)/src -l:vosk.a -lopfs.js -lembind -pthread -flto --pre-js pre.js -o ../BrowserRecognizer.js && \
cd .. && \
rm -f BrowserRecognizer.worker.js && \
sed -i 's/locateFile("BrowserRecognizer.worker.js")/pthreadUrl/g' BrowserRecognizer.js && \

8
src/genericModel.cc
View File

@@ -2,7 +2,7 @@
genericModel::genericModel(const std::string& storepath, const std::string &id, int index) : storepath(storepath), id(id), index(index) {
if(!OPFSOk) {
fireEv("_continue", "OPFS hasn't been initialized or not available", index);
fireEv("_continue", "OPFS isn't initialized or unavailable", index);
return;
}
fs::current_path("/opfs", tank);
@@ -28,7 +28,7 @@ bool genericModel::checkModel() {
std::string oldid(size, ' ');
file.seekg(0);
file.read(&oldid[0], size);
return id.compare(oldid) == 0 ? true : false;
return id.compare(oldid) == 0;
}
void genericModel::afterFetch() {
thrd.addTask([this](){
@@ -41,6 +41,10 @@ void genericModel::afterFetch() {
}
fs::remove("/opfs/m0dEl.tar",tank);
fs::remove("README",tank);
if(!checkModelFiles()) {
fireEv("_continue", "URL contains invalid model files", index);
return;
}
std::ofstream idFile("id");
if(!idFile.is_open()) {
fs::current_path("/opfs", tank);

2
src/genericModel.h
View File

@@ -19,7 +19,7 @@ struct genericModel {
int index{};
static bool extractModel();
virtual bool checkModelFiles() = 0;
virtual void load(bool) = 0;
virtual void load(bool newThrd) = 0;
bool checkModel();
void afterFetch();
genericModel(const std::string &storepath, const std::string &id, int index);

45
src/global.cc
View File

@@ -1,40 +1,47 @@
#include "global.h"
pthread_t dstThrd{pthread_self()};
std::error_code tank{};
bool OPFSOk{};
ProxyingQueue glbQ{};
void fireEv(const char *type, const char *content, int index) {
static ProxyingQueue pq{};
auto proxy{[index, type, content](){
EM_ASM({
objs[$0].dispatchEvent(new CustomEvent(UTF8ToString($1), {"detail" : UTF8ToString($2)}));
},index, type, content);
}};
if(selfTID == pthread_self()) {
if(dstThrd == pthread_self()) {
proxy();
return;
}
pq.proxySync(selfTID, proxy);
glbQ.proxySync(dstThrd, proxy);
}
int main() {
std::thread t{[](){
OPFSOk = (wasmfs_create_directory("/opfs", 0777, wasmfs_create_opfs_backend()) == 0 ? true : false);
}};
t.detach();
emscripten_exit_with_live_runtime();
}
ProxyingQueue reusableThrd::pq{};
reusableThrd::reusableThrd() {
thrd = std::thread{[this](){
void reusableThrd::addTask(std::function<void()> task) {
static std::thread thrd{[this](){
while(!done.test()) {
static ProxyingQueue pq{};
pq.execute();
blocker.wait(done.test(), std::memory_order_relaxed);
while(!queue.empty()) {
queue.front()();
queue.pop();
}
blocker.wait(done.test(std::memory_order_relaxed) || queue.empty(), std::memory_order_relaxed);
blocker.clear(std::memory_order_relaxed);
}
}};
thrd.detach();
}
void reusableThrd::addTask(std::function<void()> task) {
pq.proxyAsync(thrd.native_handle(), std::move(task));
queue.emplace(std::move(task));
blocker.test_and_set(std::memory_order_relaxed);
blocker.notify_one();
}
reusableThrd::~reusableThrd() {
done.test_and_set(std::memory_order_relaxed);
done.notify_one();
}
int main() {
std::thread t{[](){
OPFSOk = wasmfs_create_directory("/opfs", 0777, wasmfs_create_opfs_backend()) == 0;
}};
t.detach();
emscripten_exit_with_live_runtime();
}

15
src/global.h
View File

@@ -1,6 +1,7 @@
#pragma once
#include <thread>
#include <atomic>
#include <queue>
#include <emscripten/wasmfs.h>
#include <emscripten/console.h>
@@ -8,18 +9,18 @@
#include <emscripten/proxying.h>
using namespace emscripten;
static pthread_t selfTID{pthread_self()};
static std::error_code tank{};
static bool OPFSOk{};
extern bool OPFSOk;
extern std::error_code tank;
extern pthread_t dstThrd;
extern ProxyingQueue glbQ;
void fireEv(const char *type, const char *content, int index);
int main();
struct reusableThrd { // A minimal std::thread wrapper to run exactly 2 tasks
static ProxyingQueue pq;
std::thread thrd;
struct reusableThrd {
std::queue<std::function<void()>> queue{};
std::atomic_flag blocker{};
std::atomic_flag done{};
reusableThrd();
void addTask(std::function<void()> task);
~reusableThrd();
};

8
src/pre.js
View File

@@ -21,13 +21,13 @@ class genericModel extends EventTarget {
return resolve(mdl)
}
mdl.delete()
return reject(ev.detail)
reject(ev.detail)
}, {once : true})
if(normalMdl) {
mdl.obj = new Module.model(storepath, id, objs.length)
mdl.obj = new Module.model(storepath, id, objs.length-1)
}
else {
mdl.obj = new Module.spkModel(storepath, id, objs.length)
mdl.obj = new Module.spkModel(storepath, id, objs.length-1)
}
if(mdl.obj.checkModel()) {
mdl.obj.load(true)
@@ -76,7 +76,7 @@ class Recognizer extends EventTarget {
rec.delete()
reject(ev.detail)
}, {once : true})
rec.obj = new Module.recognizer(model, sampleRate, objs.length)
rec.obj = new Module.recognizer(model, sampleRate, objs.length-1)
rec.ptr = Module._malloc(512)
})
}

28
src/recognizer.cc
View File

@@ -1,7 +1,8 @@
#include "recognizer.h"
recognizer::recognizer(model* mdl, float sampleRate, int index) : index(index) {
if(!OPFSOk) {
fireEv("_continue", "OPFS hasn't been initialized or not available", index);
fireEv("_continue", "OPFS isn't initialized or unavailable", index);
return;
}
auto main{[this, mdl, sampleRate](){
@@ -11,10 +12,10 @@ recognizer::recognizer(model* mdl, float sampleRate, int index) : index(index) {
return;
}
fireEv("_continue", "." ,this->index);
while(!done.test()) {
controller1.wait(false, std::memory_order_relaxed);
controller2.wait(false, std::memory_order_relaxed);
if(!done.test()) {
while(!done.test(std::memory_order_relaxed)) {
controller.wait(!done.test(std::memory_order_relaxed), std::memory_order_relaxed);
controller.clear(std::memory_order_relaxed);
if(done.test(std::memory_order_relaxed)) continue;
switch(vosk_recognizer_accept_waveform_f(rec, dataPtr, 512)) {
case 0:
fireEv("result", vosk_recognizer_result(rec), this->index);
@@ -23,7 +24,6 @@ recognizer::recognizer(model* mdl, float sampleRate, int index) : index(index) {
fireEv("partialResult", vosk_recognizer_partial_result(rec), this->index);
}
}
}
}};
if(mdl->recognizerUsedThrd) {
mdl->thrd.addTask(main);
@@ -35,22 +35,16 @@ recognizer::recognizer(model* mdl, float sampleRate, int index) : index(index) {
}
recognizer::~recognizer() {
done.test_and_set(std::memory_order_relaxed);
controller1.notify_one();
done.notify_one();
controller.test_and_set(std::memory_order_relaxed);
controller.notify_one();
vosk_recognizer_free(rec);
free(dataPtr);
}
void recognizer::acceptWaveForm() {
controller1.test_and_set(std::memory_order_relaxed);
controller1.notify_one();
controller1.clear(std::memory_order_relaxed);
controller1.notify_one(); //Make sure c1 is locked before unlocking c2
controller2.test_and_set(std::memory_order_relaxed);
controller2.notify_one();
controller2.clear(std::memory_order_relaxed);
controller2.notify_one();
emscripten_console_log("Unblocked");
fireEv("result", "Test event", index);
controller.test_and_set(std::memory_order_relaxed);
controller.notify_one();
}
void recognizer::setGrm(const std::string& grm) {
vosk_recognizer_set_grm(rec, grm.c_str());

8
src/recognizer.h
View File

@@ -4,17 +4,11 @@
#include "global.h"
#include <filesystem>
#include <AL/al.h>
#include <AL/alc.h>
#include <archive.h>
#include <archive_entry.h>
namespace fs = std::filesystem;
struct recognizer {
std::atomic_flag done{};
std::atomic_flag controller1{};
std::atomic_flag controller2{};
std::atomic_flag controller{};
float* dataPtr{};
int index{};
VoskRecognizer* rec{};