Skip to content
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

Jump to bottom

Use murmur hash on symbol instance keys to reduce worker transfer costs. #7127

Merged
merged 4 commits into from
Aug 22, 2018
Merged

Use murmur hash on symbol instance keys to reduce worker transfer costs. #7127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd7c01c
Use murmur hash on symbol instance keys to reduce worker transfer costs.
ChrisLoer Aug 14, 2018
57ee650
Move from variable number of "placedTextSymbolIndices to 0,1, or 2.
ChrisLoer Aug 16, 2018
0fd76c1
Make symbolInstances array transferrable.
ChrisLoer Aug 16, 2018
9ae96a7
Make symbolInstance lookups per SymbolBucket sort linear in number of…
ChrisLoer Aug 22, 2018
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
5 changes: 3 additions & 2 deletions build/generate-struct-arrays.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ createStructArrayType('raster_bounds', rasterBoundsAttributes);

const circleAttributes = require('../src/data/bucket/circle_attributes').default;
const fillAttributes = require('../src/data/bucket/fill_attributes').default;
const fillExtrusionAttributes = require('../src/data/bucket/fill_extrusion_attributes').default ;
const fillExtrusionAttributes = require('../src/data/bucket/fill_extrusion_attributes').default;
const lineAttributes = require('../src/data/bucket/line_attributes').default;

// layout vertex arrays
Expand All @@ -150,6 +150,7 @@ const {
collisionCircleLayout,
collisionVertexAttributes,
placement,
symbolInstance,
glyphOffset,
lineVertex
} = require('../src/data/bucket/symbol_attributes');
Expand All @@ -162,6 +163,7 @@ createStructArrayType(`collision_box_layout`, collisionBoxLayout);
createStructArrayType(`collision_circle_layout`, collisionCircleLayout);
createStructArrayType(`collision_vertex`, collisionVertexAttributes);
createStructArrayType('placed_symbol', placement, true);
createStructArrayType('symbol_instance', symbolInstance, true);
createStructArrayType('glyph_offset', glyphOffset, true);
createStructArrayType('symbol_line_vertex', lineVertex, true);

Expand Down Expand Up @@ -233,4 +235,3 @@ export {
${[...arrayTypeEntries].join(',\n ')}
};
`);

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"gl-matrix": "^2.6.1",
"grid-index": "^1.0.0",
"minimist": "0.0.8",
"murmurhash-js": "^1.0.0",
"pbf": "^3.0.5",
"quickselect": "^1.0.0",
"rw": "^1.3.3",
Expand Down
141 changes: 141 additions & 0 deletions src/data/array_types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,74 @@ StructArrayLayout2i2ui3ul3ui2f2ub40.prototype.bytesPerElement = 40;
register('StructArrayLayout2i2ui3ul3ui2f2ub40', StructArrayLayout2i2ui3ul3ui2f2ub40);


/**
* Implementation of the StructArray layout:
* [0]: Int16[4]
* [8]: Uint16[9]
* [28]: Uint32[1]
*
* @private
*/
class StructArrayLayout4i9ui1ul32 extends StructArray {
uint8: Uint8Array;
int16: Int16Array;
uint16: Uint16Array;
uint32: Uint32Array;

_refreshViews() {
this.uint8 = new Uint8Array(this.arrayBuffer);
this.int16 = new Int16Array(this.arrayBuffer);
this.uint16 = new Uint16Array(this.arrayBuffer);
this.uint32 = new Uint32Array(this.arrayBuffer);
}

emplaceBack(v0: number, v1: number, v2: number, v3: number, v4: number, v5: number, v6: number, v7: number, v8: number, v9: number, v10: number, v11: number, v12: number, v13: number) {
const i = this.length;
this.resize(i + 1);
const o2 = i * 16;
const o4 = i * 8;
this.int16[o2 + 0] = v0;
this.int16[o2 + 1] = v1;
this.int16[o2 + 2] = v2;
this.int16[o2 + 3] = v3;
this.uint16[o2 + 4] = v4;
this.uint16[o2 + 5] = v5;
this.uint16[o2 + 6] = v6;
this.uint16[o2 + 7] = v7;
this.uint16[o2 + 8] = v8;
this.uint16[o2 + 9] = v9;
this.uint16[o2 + 10] = v10;
this.uint16[o2 + 11] = v11;
this.uint16[o2 + 12] = v12;
this.uint32[o4 + 7] = v13;
return i;
}

emplace(i: number, v0: number, v1: number, v2: number, v3: number, v4: number, v5: number, v6: number, v7: number, v8: number, v9: number, v10: number, v11: number, v12: number, v13: number) {
const o2 = i * 16;
const o4 = i * 8;
this.int16[o2 + 0] = v0;
this.int16[o2 + 1] = v1;
this.int16[o2 + 2] = v2;
this.int16[o2 + 3] = v3;
this.uint16[o2 + 4] = v4;
this.uint16[o2 + 5] = v5;
this.uint16[o2 + 6] = v6;
this.uint16[o2 + 7] = v7;
this.uint16[o2 + 8] = v8;
this.uint16[o2 + 9] = v9;
this.uint16[o2 + 10] = v10;
this.uint16[o2 + 11] = v11;
this.uint16[o2 + 12] = v12;
this.uint32[o4 + 7] = v13;
return i;
}
}

StructArrayLayout4i9ui1ul32.prototype.bytesPerElement = 32;
register('StructArrayLayout4i9ui1ul32', StructArrayLayout4i9ui1ul32);


/**
* Implementation of the StructArray layout:
* [0]: Float32[1]
Expand Down Expand Up @@ -732,6 +800,11 @@ class StructArrayLayout1ui2 extends StructArray {
return i;
}

emplace(i: number, v0: number) {
const o2 = i * 1;
this.uint16[o2 + 0] = v0;
return i;
}
}

StructArrayLayout1ui2.prototype.bytesPerElement = 2;
Expand Down Expand Up @@ -941,6 +1014,73 @@ export class PlacedSymbolArray extends StructArrayLayout2i2ui3ul3ui2f2ub40 {

register('PlacedSymbolArray', PlacedSymbolArray);

class SymbolInstanceStruct extends Struct {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

running yarn run codegen gets rid of this. Do you have some uncommitted changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😳 OMG you mean I didn't have to make that all by hand. 🤦‍♂️

_structArray: SymbolInstanceArray;
anchorX: number;
anchorY: number;
horizontalPlacedTextSymbolIndex: number;
verticalPlacedTextSymbolIndex: number;
key: number;
textBoxStartIndex: number;
textBoxEndIndex: number;
iconBoxStartIndex: number;
iconBoxEndIndex: number;
featureIndex: number;
numGlyphVertices: number;
numVerticalGlyphVertices: number;
numIconVertices: number;
crossTileID: number;
get anchorX() { return this._structArray.int16[this._pos2 + 0]; }
set anchorX(x) { this._structArray.int16[this._pos2 + 0] = x; }
get anchorY() { return this._structArray.int16[this._pos2 + 1]; }
set anchorY(x) { this._structArray.int16[this._pos2 + 1] = x; }
get horizontalPlacedTextSymbolIndex() { return this._structArray.int16[this._pos2 + 2]; }
set horizontalPlacedTextSymbolIndex(x) { this._structArray.int16[this._pos2 + 2] = x; }
get verticalPlacedTextSymbolIndex() { return this._structArray.int16[this._pos2 + 3]; }
set verticalPlacedTextSymbolIndex(x) { this._structArray.int16[this._pos2 + 3] = x; }
get key() { return this._structArray.uint16[this._pos2 + 4]; }
set key(x) { this._structArray.uint16[this._pos2 + 4] = x; }
get textBoxStartIndex() { return this._structArray.uint16[this._pos2 + 5]; }
set textBoxStartIndex(x) { this._structArray.uint16[this._pos2 + 5] = x; }
get textBoxEndIndex() { return this._structArray.uint16[this._pos2 + 6]; }
set textBoxEndIndex(x) { this._structArray.uint16[this._pos2 + 6] = x; }
get iconBoxStartIndex() { return this._structArray.uint16[this._pos2 + 7]; }
set iconBoxStartIndex(x) { this._structArray.uint16[this._pos2 + 7] = x; }
get iconBoxEndIndex() { return this._structArray.uint16[this._pos2 + 8]; }
set iconBoxEndIndex(x) { this._structArray.uint16[this._pos2 + 8] = x; }
get featureIndex() { return this._structArray.uint16[this._pos2 + 9]; }
set featureIndex(x) { this._structArray.uint16[this._pos2 + 9] = x; }
get numGlyphVertices() { return this._structArray.uint16[this._pos2 + 10]; }
set numGlyphVertices(x) { this._structArray.uint16[this._pos2 + 10] = x; }
get numVerticalGlyphVertices() { return this._structArray.uint16[this._pos2 + 11]; }
set numVerticalGlyphVertices(x) { this._structArray.uint16[this._pos2 + 11] = x; }
get numIconVertices() { return this._structArray.uint16[this._pos2 + 12]; }
set numIconVertices(x) { this._structArray.uint16[this._pos2 + 12] = x; }
get crossTileID() { return this._structArray.uint32[this._pos4 + 7]; }
set crossTileID(x) { this._structArray.uint32[this._pos4 + 7] = x; }
}

SymbolInstanceStruct.prototype.size = 32;

export type SymbolInstance = SymbolInstanceStruct;


/**
* @private
*/
export class SymbolInstanceArray extends StructArrayLayout4i9ui1ul32 {
/**
* Return the SymbolInstanceStruct at the given location in the array.
* @param {number} index The index of the element.
*/
get(index: number): SymbolInstanceStruct {
assert(!this.isTransferred);
return new SymbolInstanceStruct(this, index);
}
}

register('SymbolInstanceArray', SymbolInstanceArray);

class GlyphOffsetStruct extends Struct {
_structArray: GlyphOffsetArray;
offsetX: number;
Expand Down Expand Up @@ -1054,6 +1194,7 @@ export {
StructArrayLayout2i2i2i12,
StructArrayLayout2ub4,
StructArrayLayout2i2ui3ul3ui2f2ub40,
StructArrayLayout4i9ui1ul32,
StructArrayLayout1f4,
StructArrayLayout3i6,
StructArrayLayout1ul2ui8,
Expand Down
17 changes: 17 additions & 0 deletions src/data/bucket/symbol_attributes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,23 @@ export const placement = createLayout([
{ type: 'Uint8', name: 'hidden' }
]);

export const symbolInstance = createLayout([
{ type: 'Int16', name: 'anchorX' },
{ type: 'Int16', name: 'anchorY' },
{ type: 'Int16', name: 'horizontalPlacedTextSymbolIndex' },
{ type: 'Int16', name: 'verticalPlacedTextSymbolIndex' },
{ type: 'Uint16', name: 'key' },
{ type: 'Uint16', name: 'textBoxStartIndex' },
{ type: 'Uint16', name: 'textBoxEndIndex' },
{ type: 'Uint16', name: 'iconBoxStartIndex' },
{ type: 'Uint16', name: 'iconBoxEndIndex' },
{ type: 'Uint16', name: 'featureIndex' },
{ type: 'Uint16', name: 'numGlyphVertices' },
{ type: 'Uint16', name: 'numVerticalGlyphVertices' },
{ type: 'Uint16', name: 'numIconVertices' },
{ type: 'Uint32', name: 'crossTileID' }
]);

export const glyphOffset = createLayout([
{ type: 'Float32', name: 'offsetX' }
]);
Expand Down
Loading