Skip to content

[browser][non-icu] HybridGlobalization faster encoding for change case. #85516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 3, 2023
Merged

[browser][non-icu] HybridGlobalization faster encoding for change case. #85516

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
72054b3
This speeds it up ~twice.
ilonatommy Apr 28, 2023
c41af60
Merge branch 'main' into hg-change-case-faster-decoding
ilonatommy May 2, 2023
08d28e3
JS's decoder always changes the codepoint.
ilonatommy May 2, 2023
c065c75
Merge branch 'main' into hg-change-case-faster-decoding
ilonatommy May 3, 2023
6bee260
@kg's optimization idea.
ilonatommy May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions src/mono/wasm/runtime/hybrid-globalization.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

import { Module } from "./imports";
import { mono_wasm_new_external_root } from "./roots";
import {MonoString, MonoStringRef } from "./types";
import { Int32Ptr } from "./types/emscripten";
Expand All @@ -10,7 +9,7 @@ import { setU16 } from "./memory";

export function mono_wasm_change_case_invariant(exceptionMessage: Int32Ptr, src: number, srcLength: number, dst: number, dstLength: number, toUpper: number) : void{
try{
const input = get_utf16_string(src, srcLength);
const input = string_decoder.decode(<any>src, <any>(src + 2*srcLength));
let result = toUpper ? input.toUpperCase() : input.toLowerCase();
// Unicode defines some codepoints which expand into multiple codepoints,
// originally we do not support this expansion
Expand All @@ -31,7 +30,7 @@ export function mono_wasm_change_case(exceptionMessage: Int32Ptr, culture: MonoS
const cultureName = conv_string_root(cultureRoot);
if (!cultureName)
throw new Error("Cannot change case, the culture name is null.");
const input = get_utf16_string(src, srcLength);
const input = string_decoder.decode(<any>src, <any>(src + 2*srcLength));
let result = toUpper ? input.toLocaleUpperCase(cultureName) : input.toLocaleLowerCase(cultureName);
if (result.length > destLength)
result = input;
Expand All @@ -47,14 +46,6 @@ export function mono_wasm_change_case(exceptionMessage: Int32Ptr, culture: MonoS
}
}

function get_utf16_string(ptr: number, length: number): string{
const view = new Uint16Array(Module.HEAPU16.buffer, ptr, length);
let string = "";
for (let i = 0; i < length; i++)
string += String.fromCharCode(view[i]);
return string;
}

export function mono_wasm_compare_string(exceptionMessage: Int32Ptr, culture: MonoStringRef, str1: number, str1Length: number, str2: number, str2Length: number, options: number) : number{
const cultureRoot = mono_wasm_new_external_root<MonoString>(culture);
try{
Expand Down