Add local caching of "simple" Graphics State (ExtGState) data in PartialEvaluator.getOperatorList (issue 2813)

This patch will help pathological cases the most, with issue 2813 being a particularily problematic example. While there's only *four* `/ExtGState` resources, there's a total `29062` of `setGState` operators. Even though parsing of a single `/ExtGState` resource is quite fast, having to re-parse them thousands of times does add up quite significantly.

For simplicity we'll only cache "simple" `/ExtGState` resource, since e.g. the general `SMask` case cannot be easily cached (without re-factoring other code, which may have undesirable effects on general parsing).

By caching "simple" `/ExtGState` resource, we thus improve performance by:
 - Not having to fetch/validate/parse the same `/ExtGState` data over and over.
 - Handling of repeated `setGState` operators becomes *synchronous* during the `OperatorList` building, instead of having to defer to the event-loop/microtask-queue since the `/ExtGState` parsing is done asynchronously.

---

Obviously I had intended to include (standard) benchmark results with this patch, but for reasons I don't understand the test run-time (even with `master`) of the document in issue 2813 is *a lot* slower than in the development viewer (making normal benchmarking infeasible).
However, testing this manually in the development viewer (using `pdfBug=Stats`) shows a *reduction* of `~10 %` in the rendering time of the PDF document in issue 2813.
This commit is contained in:
Jonas Jenwald 2020-07-11 13:52:11 +02:00
parent 6c39aff374
commit 90eb579713
3 changed files with 127 additions and 36 deletions

View File

@ -75,7 +75,11 @@ import {
import { getTilingPatternIR, Pattern } from "./pattern.js"; import { getTilingPatternIR, Pattern } from "./pattern.js";
import { isPDFFunction, PDFFunctionFactory } from "./function.js"; import { isPDFFunction, PDFFunctionFactory } from "./function.js";
import { Lexer, Parser } from "./parser.js"; import { Lexer, Parser } from "./parser.js";
import { LocalColorSpaceCache, LocalImageCache } from "./image_utils.js"; import {
LocalColorSpaceCache,
LocalGStateCache,
LocalImageCache,
} from "./image_utils.js";
import { bidi } from "./bidi.js"; import { bidi } from "./bidi.js";
import { ColorSpace } from "./colorspace.js"; import { ColorSpace } from "./colorspace.js";
import { DecodeStream } from "./stream.js"; import { DecodeStream } from "./stream.js";
@ -828,14 +832,18 @@ class PartialEvaluator {
throw reason; throw reason;
} }
setGState( setGState({
resources, resources,
gState, gState,
operatorList, operatorList,
cacheKey,
task, task,
stateManager, stateManager,
localColorSpaceCache localGStateCache,
) { localColorSpaceCache,
}) {
const gStateRef = gState.objId;
let isSimpleGState = true;
// This array holds the converted/processed state data. // This array holds the converted/processed state data.
var gStateObj = []; var gStateObj = [];
var gStateKeys = gState.getKeys(); var gStateKeys = gState.getKeys();
@ -881,6 +889,8 @@ class PartialEvaluator {
break; break;
} }
if (isDict(value)) { if (isDict(value)) {
isSimpleGState = false;
promise = promise.then(() => { promise = promise.then(() => {
return this.handleSMask( return this.handleSMask(
value, value,
@ -925,6 +935,10 @@ class PartialEvaluator {
if (gStateObj.length > 0) { if (gStateObj.length > 0) {
operatorList.addOp(OPS.setGState, [gStateObj]); operatorList.addOp(OPS.setGState, [gStateObj]);
} }
if (isSimpleGState) {
localGStateCache.set(cacheKey, gStateRef, gStateObj);
}
}); });
} }
@ -1245,6 +1259,7 @@ class PartialEvaluator {
let parsingText = false; let parsingText = false;
const localImageCache = new LocalImageCache(); const localImageCache = new LocalImageCache();
const localColorSpaceCache = new LocalColorSpaceCache(); const localColorSpaceCache = new LocalColorSpaceCache();
const localGStateCache = new LocalGStateCache();
var xobjs = resources.get("XObject") || Dict.empty; var xobjs = resources.get("XObject") || Dict.empty;
var patterns = resources.get("Pattern") || Dict.empty; var patterns = resources.get("Pattern") || Dict.empty;
@ -1274,7 +1289,8 @@ class PartialEvaluator {
operation = {}, operation = {},
i, i,
ii, ii,
cs; cs,
name;
while (!(stop = timeSlotManager.check())) { while (!(stop = timeSlotManager.check())) {
// The arguments parsed by read() are used beyond this loop, so we // The arguments parsed by read() are used beyond this loop, so we
// cannot reuse the same array on each iteration. Therefore we pass // cannot reuse the same array on each iteration. Therefore we pass
@ -1290,7 +1306,7 @@ class PartialEvaluator {
switch (fn | 0) { switch (fn | 0) {
case OPS.paintXObject: case OPS.paintXObject:
// eagerly compile XForm objects // eagerly compile XForm objects
var name = args[0].name; name = args[0].name;
if (name) { if (name) {
const localImage = localImageCache.getByName(name); const localImage = localImageCache.getByName(name);
if (localImage) { if (localImage) {
@ -1653,23 +1669,64 @@ class PartialEvaluator {
fn = OPS.shadingFill; fn = OPS.shadingFill;
break; break;
case OPS.setGState: case OPS.setGState:
var dictName = args[0]; name = args[0].name;
var extGState = resources.get("ExtGState"); if (name) {
const localGStateObj = localGStateCache.getByName(name);
if (!isDict(extGState) || !extGState.has(dictName.name)) { if (localGStateObj) {
break; if (localGStateObj.length > 0) {
operatorList.addOp(OPS.setGState, [localGStateObj]);
}
args = null;
continue;
}
} }
var gState = extGState.get(dictName.name);
next( next(
self.setGState( new Promise(function (resolveGState, rejectGState) {
resources, if (!name) {
gState, throw new FormatError("GState must be referred to by name.");
operatorList, }
task,
stateManager, const extGState = resources.get("ExtGState");
localColorSpaceCache if (!(extGState instanceof Dict)) {
) throw new FormatError("ExtGState should be a dictionary.");
}
const gState = extGState.get(name);
// TODO: Attempt to lookup cached GStates by reference as well,
// if and only if there are PDF documents where doing so
// would significantly improve performance.
if (!(gState instanceof Dict)) {
throw new FormatError("GState should be a dictionary.");
}
self
.setGState({
resources,
gState,
operatorList,
cacheKey: name,
task,
stateManager,
localGStateCache,
localColorSpaceCache,
})
.then(resolveGState, rejectGState);
}).catch(function (reason) {
if (reason instanceof AbortException) {
return;
}
if (self.options.ignoreErrors) {
// Error(s) in the ExtGState -- sending unsupported feature
// notification and allow parsing/rendering to continue.
self.handler.send("UnsupportedFeature", {
featureId: UNSUPPORTED_FEATURES.errorExtGState,
});
warn(`getOperatorList - ignoring ExtGState: "${reason}".`);
return;
}
throw reason;
})
); );
return; return;
case OPS.moveTo: case OPS.moveTo:

View File

@ -113,6 +113,27 @@ class LocalFunctionCache extends BaseLocalCache {
} }
} }
class LocalGStateCache extends BaseLocalCache {
set(name, ref = null, data) {
if (!name) {
throw new Error('LocalGStateCache.set - expected "name" argument.');
}
if (ref) {
if (this._imageCache.has(ref)) {
return;
}
this._nameRefMap.set(name, ref);
this._imageCache.put(ref, data);
return;
}
// name
if (this._imageMap.has(name)) {
return;
}
this._imageMap.set(name, data);
}
}
class GlobalImageCache { class GlobalImageCache {
static get NUM_PAGES_THRESHOLD() { static get NUM_PAGES_THRESHOLD() {
return shadow(this, "NUM_PAGES_THRESHOLD", 2); return shadow(this, "NUM_PAGES_THRESHOLD", 2);
@ -210,5 +231,6 @@ export {
LocalImageCache, LocalImageCache,
LocalColorSpaceCache, LocalColorSpaceCache,
LocalFunctionCache, LocalFunctionCache,
LocalGStateCache,
GlobalImageCache, GlobalImageCache,
}; };

View File

@ -242,23 +242,35 @@ describe("evaluator", function () {
); );
}); });
it("should execute if nested commands", function (done) { it("should execute if nested commands", function (done) {
const gState = new Dict();
gState.set("LW", 2);
gState.set("CA", 0.5);
const extGState = new Dict();
extGState.set("GS2", gState);
const resources = new ResourcesMock();
resources.ExtGState = extGState;
var stream = new StringStream("/F2 /GS2 gs 5.711 Tf"); var stream = new StringStream("/F2 /GS2 gs 5.711 Tf");
runOperatorListCheck( runOperatorListCheck(partialEvaluator, stream, resources, function (
partialEvaluator, result
stream, ) {
new ResourcesMock(), expect(result.fnArray.length).toEqual(3);
function (result) { expect(result.fnArray[0]).toEqual(OPS.setGState);
expect(result.fnArray.length).toEqual(3); expect(result.fnArray[1]).toEqual(OPS.dependency);
expect(result.fnArray[0]).toEqual(OPS.setGState); expect(result.fnArray[2]).toEqual(OPS.setFont);
expect(result.fnArray[1]).toEqual(OPS.dependency); expect(result.argsArray.length).toEqual(3);
expect(result.fnArray[2]).toEqual(OPS.setFont); expect(result.argsArray[0]).toEqual([
expect(result.argsArray.length).toEqual(3); [
expect(result.argsArray[0].length).toEqual(1); ["LW", 2],
expect(result.argsArray[1].length).toEqual(1); ["CA", 0.5],
expect(result.argsArray[2].length).toEqual(2); ],
done(); ]);
} expect(result.argsArray[1]).toEqual(["g_font_error"]);
); expect(result.argsArray[2]).toEqual(["g_font_error", 5.711]);
done();
});
}); });
it("should skip if too few arguments", function (done) { it("should skip if too few arguments", function (done) {
var stream = new StringStream("5 d0"); var stream = new StringStream("5 d0");